Mercurial > vim
annotate src/ops.c @ 17417:aa4532c1d001 v8.1.1707
patch 8.1.1707: Coverity warns for possibly using a NULL pointer
commit https://github.com/vim/vim/commit/cfdbc5adde49cbab939e8164555ed0b8d9ce000b
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 17 21:27:52 2019 +0200
patch 8.1.1707: Coverity warns for possibly using a NULL pointer
Problem: Coverity warns for possibly using a NULL pointer.
Solution: Change the logic to make sure no NULL pointer is used.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 17 Jul 2019 21:30:04 +0200 |
| parents | 40c4cb095d53 |
| children | d4b2a212fa2f |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
| 12 * op_change, op_yank, do_put, do_join | |
| 13 */ | |
| 14 | |
| 15 #include "vim.h" | |
| 16 | |
| 17 /* | |
| 18 * Number of registers. | |
| 19 * 0 = unnamed register, for normal yanks and puts | |
| 20 * 1..9 = registers '1' to '9', for deletes | |
| 21 * 10..35 = registers 'a' to 'z' | |
| 22 * 36 = delete register '-' | |
| 23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
| 24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
| 25 */ | |
| 26 /* | |
| 27 * Symbolic names for some registers. | |
| 28 */ | |
| 29 #define DELETION_REGISTER 36 | |
| 30 #ifdef FEAT_CLIPBOARD | |
| 31 # define STAR_REGISTER 37 | |
| 32 # ifdef FEAT_X11 | |
| 33 # define PLUS_REGISTER 38 | |
| 34 # else | |
| 35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
| 36 # endif | |
| 37 #endif | |
| 38 #ifdef FEAT_DND | |
| 39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
| 40 #endif | |
| 41 | |
| 42 #ifdef FEAT_CLIPBOARD | |
| 43 # ifdef FEAT_DND | |
| 44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
| 45 # else | |
| 46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
| 47 # endif | |
| 48 #else | |
| 49 # define NUM_REGISTERS 37 | |
| 50 #endif | |
| 51 | |
| 52 /* | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
| 7 | 54 */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
| 7 | 56 { |
| 57 char_u **y_array; /* pointer to array of line pointers */ | |
| 58 linenr_T y_size; /* number of lines in y_array */ | |
| 59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
| 60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
| 7 | 69 static int y_append; /* TRUE when appending */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
| 7 | 71 |
| 72 /* | |
| 73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
| 74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
| 75 */ | |
| 76 struct block_def | |
| 77 { | |
| 1839 | 78 int startspaces; /* 'extra' cols before first char */ |
| 79 int endspaces; /* 'extra' cols after last char */ | |
| 7 | 80 int textlen; /* chars in block */ |
| 1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
| 82 colnr_T textcol; /* index of chars (partially) in block */ | |
| 7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
| 84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
| 85 int is_short; /* TRUE if line is too short to fit in block */ | |
| 86 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
| 87 int is_oneChar; /* TRUE if block within one character */ | |
| 88 int pre_whitesp; /* screen cols of ws before block */ | |
| 89 int pre_whitesp_c; /* chars of ws before block */ | |
| 90 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
| 91 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
| 92 }; | |
| 93 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
94 static void shift_block(oparg_T *oap, int amount); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
95 static int stuff_yank(int, char_u *); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
96 static void put_reedit_in_typebuf(int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static int put_in_typebuf(char_u *s, int esc, int colon, |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 static void stuffescaped(char_u *arg, int literally); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static void mb_adjust_opend(oparg_T *oap); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void free_yank_all(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int yank_copy_line(struct block_def *bd, long y_idx); |
| 7 | 103 #ifdef FEAT_CLIPBOARD |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
104 static void copy_yank_reg(yankreg_T *reg); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
105 static void may_set_selection(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 static void dis_msg(char_u *p, int skip_esc); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
| 7 | 110 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
111 static void str_to_reg(yankreg_T *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
112 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static int ends_in_white(linenr_T lnum); |
| 7 | 114 #ifdef FEAT_COMMENTS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
| 7 | 116 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static int fmt_check_par(linenr_T); |
| 7 | 118 #endif |
| 119 | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
120 // Flags for third item in "opchars". |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
121 #define OPF_LINES 1 // operator always works on lines |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
122 #define OPF_CHANGE 2 // operator changes text |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
123 |
| 7 | 124 /* |
| 125 * The names of operators. | |
| 126 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
127 * The third field holds OPF_ flags. |
| 7 | 128 */ |
| 129 static char opchars[][3] = | |
| 130 { | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
131 {NUL, NUL, 0}, // OP_NOP |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
132 {'d', NUL, OPF_CHANGE}, // OP_DELETE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
133 {'y', NUL, 0}, // OP_YANK |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
134 {'c', NUL, OPF_CHANGE}, // OP_CHANGE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
135 {'<', NUL, OPF_LINES | OPF_CHANGE}, // OP_LSHIFT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
136 {'>', NUL, OPF_LINES | OPF_CHANGE}, // OP_RSHIFT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
137 {'!', NUL, OPF_LINES | OPF_CHANGE}, // OP_FILTER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
138 {'g', '~', OPF_CHANGE}, // OP_TILDE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
139 {'=', NUL, OPF_LINES | OPF_CHANGE}, // OP_INDENT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
140 {'g', 'q', OPF_LINES | OPF_CHANGE}, // OP_FORMAT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
141 {':', NUL, OPF_LINES}, // OP_COLON |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
142 {'g', 'U', OPF_CHANGE}, // OP_UPPER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
143 {'g', 'u', OPF_CHANGE}, // OP_LOWER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
144 {'J', NUL, OPF_LINES | OPF_CHANGE}, // DO_JOIN |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
145 {'g', 'J', OPF_LINES | OPF_CHANGE}, // DO_JOIN_NS |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
146 {'g', '?', OPF_CHANGE}, // OP_ROT13 |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
147 {'r', NUL, OPF_CHANGE}, // OP_REPLACE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
148 {'I', NUL, OPF_CHANGE}, // OP_INSERT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
149 {'A', NUL, OPF_CHANGE}, // OP_APPEND |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
150 {'z', 'f', OPF_LINES}, // OP_FOLD |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
151 {'z', 'o', OPF_LINES}, // OP_FOLDOPEN |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
152 {'z', 'O', OPF_LINES}, // OP_FOLDOPENREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
153 {'z', 'c', OPF_LINES}, // OP_FOLDCLOSE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
154 {'z', 'C', OPF_LINES}, // OP_FOLDCLOSEREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
155 {'z', 'd', OPF_LINES}, // OP_FOLDDEL |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
156 {'z', 'D', OPF_LINES}, // OP_FOLDDELREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
157 {'g', 'w', OPF_LINES | OPF_CHANGE}, // OP_FORMAT2 |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
158 {'g', '@', OPF_CHANGE}, // OP_FUNCTION |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
159 {Ctrl_A, NUL, OPF_CHANGE}, // OP_NR_ADD |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
160 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
| 7 | 161 }; |
| 162 | |
| 163 /* | |
| 164 * Translate a command name into an operator type. | |
| 165 * Must only be called with a valid operator name! | |
| 166 */ | |
| 167 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
168 get_op_type(int char1, int char2) |
| 7 | 169 { |
| 170 int i; | |
| 171 | |
| 172 if (char1 == 'r') /* ignore second character */ | |
| 173 return OP_REPLACE; | |
| 174 if (char1 == '~') /* when tilde is an operator */ | |
| 175 return OP_TILDE; | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
176 if (char1 == 'g' && char2 == Ctrl_A) /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
177 return OP_NR_ADD; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
178 if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
179 return OP_NR_SUB; |
| 7 | 180 for (i = 0; ; ++i) |
|
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
181 { |
| 7 | 182 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
| 183 break; | |
|
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
184 if (i == (int)(sizeof(opchars) / sizeof(char [3]) - 1)) |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
185 { |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
186 internal_error("get_op_type()"); |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
187 break; |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
188 } |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
189 } |
| 7 | 190 return i; |
| 191 } | |
| 192 | |
| 193 /* | |
| 194 * Return TRUE if operator "op" always works on whole lines. | |
| 195 */ | |
| 196 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
197 op_on_lines(int op) |
| 7 | 198 { |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
199 return opchars[op][2] & OPF_LINES; |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
200 } |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
201 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
202 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
203 /* |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
204 * Return TRUE if operator "op" changes text. |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
205 */ |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
206 int |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
207 op_is_change(int op) |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
208 { |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
209 return opchars[op][2] & OPF_CHANGE; |
| 7 | 210 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
211 #endif |
| 7 | 212 |
| 213 /* | |
| 214 * Get first operator command character. | |
| 215 * Returns 'g' or 'z' if there is another command character. | |
| 216 */ | |
| 217 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
218 get_op_char(int optype) |
| 7 | 219 { |
| 220 return opchars[optype][0]; | |
| 221 } | |
| 222 | |
| 223 /* | |
| 224 * Get second operator command character. | |
| 225 */ | |
| 226 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
227 get_extra_op_char(int optype) |
| 7 | 228 { |
| 229 return opchars[optype][1]; | |
| 230 } | |
| 231 | |
| 232 /* | |
| 233 * op_shift - handle a shift operation | |
| 234 */ | |
| 235 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
236 op_shift(oparg_T *oap, int curs_top, int amount) |
| 7 | 237 { |
| 238 long i; | |
| 239 int first_char; | |
| 240 int block_col = 0; | |
| 241 | |
| 242 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 243 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 244 return; | |
| 245 | |
| 246 if (oap->block_mode) | |
| 247 block_col = curwin->w_cursor.col; | |
| 248 | |
| 249 for (i = oap->line_count; --i >= 0; ) | |
| 250 { | |
| 251 first_char = *ml_get_curline(); | |
| 252 if (first_char == NUL) /* empty line */ | |
| 253 curwin->w_cursor.col = 0; | |
| 254 else if (oap->block_mode) | |
| 255 shift_block(oap, amount); | |
| 256 else | |
| 257 /* Move the line right if it doesn't start with '#', 'smartindent' | |
| 258 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
| 259 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 260 if (first_char != '#' || !preprocs_left()) | |
| 261 #endif | |
| 1516 | 262 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
| 7 | 263 ++curwin->w_cursor.lnum; |
| 264 } | |
| 265 | |
| 266 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 267 if (oap->block_mode) | |
| 268 { | |
| 269 curwin->w_cursor.lnum = oap->start.lnum; | |
| 270 curwin->w_cursor.col = block_col; | |
| 271 } | |
| 5735 | 272 else if (curs_top) /* put cursor on first line, for ">>" */ |
| 7 | 273 { |
| 274 curwin->w_cursor.lnum = oap->start.lnum; | |
| 275 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
| 276 } | |
| 277 else | |
| 278 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
| 279 | |
|
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
280 #ifdef FEAT_FOLDING |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
281 /* The cursor line is not in a closed fold */ |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
282 foldOpenCursor(); |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
283 #endif |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
284 |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
285 |
| 7 | 286 if (oap->line_count > p_report) |
| 287 { | |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
288 char *op; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
289 char *msg_line_single; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
290 char *msg_line_plural; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
291 |
| 7 | 292 if (oap->op_type == OP_RSHIFT) |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
293 op = ">"; |
| 7 | 294 else |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
295 op = "<"; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
296 msg_line_single = NGETTEXT("%ld line %sed %d time", |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
297 "%ld line %sed %d times", amount); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
298 msg_line_plural = NGETTEXT("%ld lines %sed %d time", |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
299 "%ld lines %sed %d times", amount); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
300 vim_snprintf((char *)IObuff, IOSIZE, |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
301 NGETTEXT(msg_line_single, msg_line_plural, oap->line_count), |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
302 oap->line_count, op, amount); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
303 msg((char *)IObuff); |
| 7 | 304 } |
| 305 | |
| 306 /* | |
| 307 * Set "'[" and "']" marks. | |
| 308 */ | |
| 309 curbuf->b_op_start = oap->start; | |
| 310 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 311 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 312 if (curbuf->b_op_end.col > 0) | |
| 313 --curbuf->b_op_end.col; | |
| 314 } | |
| 315 | |
| 316 /* | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
317 * Shift the current line one shiftwidth left (if left != 0) or right |
|
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
318 * leaves cursor on first blank in the line. |
| 7 | 319 */ |
| 320 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
321 shift_line( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
322 int left, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
323 int round, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
324 int amount, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 int call_changed_bytes) /* call changed_bytes() */ |
| 7 | 326 { |
| 327 int count; | |
| 328 int i, j; | |
|
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
329 int p_sw = (int)get_sw_value_indent(curbuf); |
| 7 | 330 |
| 331 count = get_indent(); /* get current indent */ | |
| 332 | |
| 333 if (round) /* round off indent */ | |
| 334 { | |
| 335 i = count / p_sw; /* number of p_sw rounded down */ | |
| 336 j = count % p_sw; /* extra spaces */ | |
| 337 if (j && left) /* first remove extra spaces */ | |
| 338 --amount; | |
| 339 if (left) | |
| 340 { | |
| 341 i -= amount; | |
| 342 if (i < 0) | |
| 343 i = 0; | |
| 344 } | |
| 345 else | |
| 346 i += amount; | |
| 347 count = i * p_sw; | |
| 348 } | |
| 349 else /* original vi indent */ | |
| 350 { | |
| 351 if (left) | |
| 352 { | |
| 353 count -= p_sw * amount; | |
| 354 if (count < 0) | |
| 355 count = 0; | |
| 356 } | |
| 357 else | |
| 358 count += p_sw * amount; | |
| 359 } | |
| 360 | |
| 361 /* Set new indent */ | |
| 362 if (State & VREPLACE_FLAG) | |
| 1516 | 363 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
| 7 | 364 else |
| 1516 | 365 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
| 7 | 366 } |
| 367 | |
| 368 /* | |
| 369 * Shift one line of the current block one shiftwidth right or left. | |
| 370 * Leaves cursor on first character in block. | |
| 371 */ | |
| 372 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
373 shift_block(oparg_T *oap, int amount) |
| 7 | 374 { |
| 375 int left = (oap->op_type == OP_LSHIFT); | |
| 376 int oldstate = State; | |
| 1839 | 377 int total; |
| 378 char_u *newp, *oldp; | |
| 7 | 379 int oldcol = curwin->w_cursor.col; |
|
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
380 int p_sw = (int)get_sw_value_indent(curbuf); |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
381 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
382 int *p_vts = curbuf->b_p_vts_array; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
383 #endif |
| 7 | 384 int p_ts = (int)curbuf->b_p_ts; |
| 385 struct block_def bd; | |
| 386 int incr; | |
| 1839 | 387 colnr_T ws_vcol; |
| 7 | 388 int i = 0, j = 0; |
| 389 int len; | |
| 390 #ifdef FEAT_RIGHTLEFT | |
| 391 int old_p_ri = p_ri; | |
| 392 | |
| 4352 | 393 p_ri = 0; /* don't want revins in indent */ |
| 7 | 394 #endif |
| 395 | |
| 396 State = INSERT; /* don't want REPLACE for State */ | |
| 397 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
| 398 if (bd.is_short) | |
| 399 return; | |
| 400 | |
| 401 /* total is number of screen columns to be inserted/removed */ | |
|
11997
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
402 total = (int)((unsigned)amount * (unsigned)p_sw); |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
403 if ((total / p_sw) != amount) |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
404 return; /* multiplication overflow */ |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
405 |
| 7 | 406 oldp = ml_get_curline(); |
| 407 | |
| 408 if (!left) | |
| 409 { | |
| 410 /* | |
| 411 * 1. Get start vcol | |
| 412 * 2. Total ws vcols | |
| 413 * 3. Divvy into TABs & spp | |
| 414 * 4. Construct new string | |
| 415 */ | |
| 416 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
| 417 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
| 418 if (bd.startspaces) | |
| 419 { | |
| 420 if (has_mbyte) | |
|
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 if ((*mb_ptr2len)(bd.textstart) == 1) |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 ++bd.textstart; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 else |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 ws_vcol = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 bd.startspaces = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
428 } |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
429 } |
| 1995 | 430 else |
| 431 ++bd.textstart; | |
| 7 | 432 } |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
433 for ( ; VIM_ISWHITE(*bd.textstart); ) |
| 7 | 434 { |
| 5995 | 435 /* TODO: is passing bd.textstart for start of the line OK? */ |
| 436 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
| 437 (colnr_T)(bd.start_vcol)); | |
| 7 | 438 total += incr; |
| 439 bd.start_vcol += incr; | |
| 440 } | |
| 441 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
| 442 * non-ws char in the block. */ | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
443 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
444 if (!curbuf->b_p_et) |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
445 tabstop_fromto(ws_vcol, ws_vcol + total, p_ts, p_vts, &i, &j); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
446 else |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
447 j = total; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
448 #else |
| 7 | 449 if (!curbuf->b_p_et) |
| 450 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
| 451 if (i) | |
| 452 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
| 453 else | |
| 454 j = total; | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
455 #endif |
| 7 | 456 /* if we're splitting a TAB, allow for it */ |
| 457 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
| 458 len = (int)STRLEN(bd.textstart) + 1; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
459 newp = alloc(bd.textcol + i + j + len); |
| 7 | 460 if (newp == NULL) |
| 461 return; | |
| 462 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
| 463 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 6929 | 464 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
| 465 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
| 7 | 466 /* the end */ |
| 467 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
| 468 } | |
| 469 else /* left */ | |
| 470 { | |
| 1839 | 471 colnr_T destination_col; /* column to which text in block will |
| 472 be shifted */ | |
| 473 char_u *verbatim_copy_end; /* end of the part of the line which is | |
| 474 copied verbatim */ | |
| 475 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
| 476 of line */ | |
| 477 unsigned fill; /* nr of spaces that replace a TAB */ | |
| 478 unsigned new_line_len; /* the length of the line after the | |
| 479 block shift */ | |
| 480 size_t block_space_width; | |
| 481 size_t shift_amount; | |
| 482 char_u *non_white = bd.textstart; | |
| 483 colnr_T non_white_col; | |
| 484 | |
| 485 /* | |
| 486 * Firstly, let's find the first non-whitespace character that is | |
| 487 * displayed after the block's start column and the character's column | |
| 488 * number. Also, let's calculate the width of all the whitespace | |
| 489 * characters that are displayed in the block and precede the searched | |
| 490 * non-whitespace character. | |
| 491 */ | |
| 492 | |
| 493 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
| 494 * the part of which is displayed at the block's beginning. Let's start | |
| 495 * searching from the next character. */ | |
| 496 if (bd.startspaces) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
497 MB_PTR_ADV(non_white); |
| 1839 | 498 |
| 499 /* The character's column is in "bd.start_vcol". */ | |
| 500 non_white_col = bd.start_vcol; | |
| 501 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
502 while (VIM_ISWHITE(*non_white)) |
| 7 | 503 { |
| 5995 | 504 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
| 1839 | 505 non_white_col += incr; |
| 7 | 506 } |
| 1839 | 507 |
| 508 block_space_width = non_white_col - oap->start_vcol; | |
| 509 /* We will shift by "total" or "block_space_width", whichever is less. | |
| 510 */ | |
| 1860 | 511 shift_amount = (block_space_width < (size_t)total |
| 512 ? block_space_width : (size_t)total); | |
| 1839 | 513 |
| 514 /* The column to which we will shift the text. */ | |
| 1860 | 515 destination_col = (colnr_T)(non_white_col - shift_amount); |
| 1839 | 516 |
| 517 /* Now let's find out how much of the beginning of the line we can | |
| 518 * reuse without modification. */ | |
| 519 verbatim_copy_end = bd.textstart; | |
| 520 verbatim_copy_width = bd.start_vcol; | |
| 521 | |
| 522 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
| 523 * preceding the block. We have to subtract its width to obtain its | |
| 524 * column number. */ | |
| 525 if (bd.startspaces) | |
| 526 verbatim_copy_width -= bd.start_char_vcols; | |
| 527 while (verbatim_copy_width < destination_col) | |
| 7 | 528 { |
| 5995 | 529 char_u *line = verbatim_copy_end; |
| 530 | |
| 531 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
| 532 incr = lbr_chartabsize(line, verbatim_copy_end, | |
| 533 verbatim_copy_width); | |
| 1839 | 534 if (verbatim_copy_width + incr > destination_col) |
| 535 break; | |
| 536 verbatim_copy_width += incr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
537 MB_PTR_ADV(verbatim_copy_end); |
| 7 | 538 } |
| 539 | |
| 1839 | 540 /* If "destination_col" is different from the width of the initial |
| 541 * part of the line that will be copied, it means we encountered a tab | |
| 542 * character, which we will have to partly replace with spaces. */ | |
| 543 fill = destination_col - verbatim_copy_width; | |
| 544 | |
| 545 /* The replacement line will consist of: | |
| 546 * - the beginning of the original line up to "verbatim_copy_end", | |
| 547 * - "fill" number of spaces, | |
| 548 * - the rest of the line, pointed to by non_white. */ | |
| 549 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
| 550 + fill | |
| 551 + (unsigned)STRLEN(non_white) + 1; | |
| 552 | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
553 newp = alloc(new_line_len); |
| 7 | 554 if (newp == NULL) |
| 555 return; | |
| 1839 | 556 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
| 6929 | 557 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
| 1839 | 558 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
| 7 | 559 } |
| 560 /* replace the line */ | |
| 561 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 562 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
| 563 State = oldstate; | |
| 564 curwin->w_cursor.col = oldcol; | |
| 565 #ifdef FEAT_RIGHTLEFT | |
| 566 p_ri = old_p_ri; | |
| 567 #endif | |
| 568 } | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
569 |
| 7 | 570 /* |
| 571 * Insert string "s" (b_insert ? before : after) block :AKelly | |
| 572 * Caller must prepare for undo. | |
| 573 */ | |
| 574 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
575 block_insert( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
576 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
577 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
578 int b_insert, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
579 struct block_def *bdp) |
| 7 | 580 { |
| 581 int p_ts; | |
| 582 int count = 0; /* extra spaces to replace a cut TAB */ | |
| 583 int spaces = 0; /* non-zero if cutting a TAB */ | |
| 584 colnr_T offset; /* pointer along new line */ | |
| 585 unsigned s_len; /* STRLEN(s) */ | |
| 586 char_u *newp, *oldp; /* new, old lines */ | |
| 587 linenr_T lnum; /* loop var */ | |
| 588 int oldstate = State; | |
| 589 | |
| 590 State = INSERT; /* don't want REPLACE for State */ | |
| 591 s_len = (unsigned)STRLEN(s); | |
| 592 | |
| 593 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
| 594 { | |
| 595 block_prep(oap, bdp, lnum, TRUE); | |
| 596 if (bdp->is_short && b_insert) | |
| 597 continue; /* OP_INSERT, line ends before block start */ | |
| 598 | |
| 599 oldp = ml_get(lnum); | |
| 600 | |
| 601 if (b_insert) | |
| 602 { | |
| 603 p_ts = bdp->start_char_vcols; | |
| 604 spaces = bdp->startspaces; | |
| 605 if (spaces != 0) | |
| 606 count = p_ts - 1; /* we're cutting a TAB */ | |
| 607 offset = bdp->textcol; | |
| 608 } | |
| 609 else /* append */ | |
| 610 { | |
| 611 p_ts = bdp->end_char_vcols; | |
| 612 if (!bdp->is_short) /* spaces = padding after block */ | |
| 613 { | |
| 614 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
| 615 if (spaces != 0) | |
| 616 count = p_ts - 1; /* we're cutting a TAB */ | |
| 617 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
| 618 } | |
| 619 else /* spaces = padding to block edge */ | |
| 620 { | |
| 621 /* if $ used, just append to EOL (ie spaces==0) */ | |
| 622 if (!bdp->is_MAX) | |
| 623 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
| 624 count = spaces; | |
| 625 offset = bdp->textcol + bdp->textlen; | |
| 626 } | |
| 627 } | |
| 628 | |
| 6140 | 629 if (has_mbyte && spaces > 0) |
| 630 { | |
| 6460 | 631 int off; |
| 632 | |
| 6140 | 633 /* Avoid starting halfway a multi-byte character. */ |
| 634 if (b_insert) | |
| 635 { | |
| 6460 | 636 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| 6140 | 637 } |
| 638 else | |
| 639 { | |
| 6460 | 640 off = (*mb_off_next)(oldp, oldp + offset); |
| 6140 | 641 offset += off; |
| 642 } | |
| 6460 | 643 spaces -= off; |
| 644 count -= off; | |
| 6140 | 645 } |
| 646 | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
647 newp = alloc(STRLEN(oldp) + s_len + count + 1); |
| 7 | 648 if (newp == NULL) |
| 649 continue; | |
| 650 | |
| 651 /* copy up to shifted part */ | |
| 652 mch_memmove(newp, oldp, (size_t)(offset)); | |
| 653 oldp += offset; | |
| 654 | |
| 655 /* insert pre-padding */ | |
| 6929 | 656 vim_memset(newp + offset, ' ', (size_t)spaces); |
| 7 | 657 |
| 658 /* copy the new text */ | |
| 659 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
| 660 offset += s_len; | |
| 661 | |
| 662 if (spaces && !bdp->is_short) | |
| 663 { | |
| 664 /* insert post-padding */ | |
| 6929 | 665 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
| 7 | 666 /* We're splitting a TAB, don't copy it. */ |
| 667 oldp++; | |
| 668 /* We allowed for that TAB, remember this now */ | |
| 669 count++; | |
| 670 } | |
| 671 | |
| 672 if (spaces > 0) | |
| 673 offset += count; | |
| 1622 | 674 STRMOVE(newp + offset, oldp); |
| 7 | 675 |
| 676 ml_replace(lnum, newp, FALSE); | |
| 677 | |
| 678 if (lnum == oap->end.lnum) | |
| 679 { | |
| 680 /* Set "']" mark to the end of the block instead of the end of | |
| 681 * the insert in the first line. */ | |
| 682 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 683 curbuf->b_op_end.col = offset; | |
| 684 } | |
| 685 } /* for all lnum */ | |
| 686 | |
| 687 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 688 | |
| 689 State = oldstate; | |
| 690 } | |
| 691 | |
| 692 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 693 /* | |
| 694 * op_reindent - handle reindenting a block of lines. | |
| 695 */ | |
| 696 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
697 op_reindent(oparg_T *oap, int (*how)(void)) |
| 7 | 698 { |
| 699 long i; | |
| 700 char_u *l; | |
| 6971 | 701 int amount; |
| 7 | 702 linenr_T first_changed = 0; |
| 703 linenr_T last_changed = 0; | |
| 704 linenr_T start_lnum = curwin->w_cursor.lnum; | |
| 705 | |
| 216 | 706 /* Don't even try when 'modifiable' is off. */ |
| 707 if (!curbuf->b_p_ma) | |
| 708 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
709 emsg(_(e_modifiable)); |
| 216 | 710 return; |
| 711 } | |
| 712 | |
| 7 | 713 for (i = oap->line_count; --i >= 0 && !got_int; ) |
| 714 { | |
| 715 /* it's a slow thing to do, so give feedback so there's no worry that | |
| 716 * the computer's just hung. */ | |
| 717 | |
| 718 if (i > 1 | |
| 719 && (i % 50 == 0 || i == oap->line_count - 1) | |
| 720 && oap->line_count > p_report) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
721 smsg(_("%ld lines to indent... "), i); |
| 7 | 722 |
| 723 /* | |
| 724 * Be vi-compatible: For lisp indenting the first line is not | |
| 725 * indented, unless there is only one line. | |
| 726 */ | |
| 727 #ifdef FEAT_LISP | |
| 728 if (i != oap->line_count - 1 || oap->line_count == 1 | |
| 729 || how != get_lisp_indent) | |
| 730 #endif | |
| 731 { | |
| 732 l = skipwhite(ml_get_curline()); | |
| 733 if (*l == NUL) /* empty or blank line */ | |
| 6971 | 734 amount = 0; |
| 7 | 735 else |
| 6971 | 736 amount = how(); /* get the indent for this line */ |
| 737 | |
| 738 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
| 7 | 739 { |
| 740 /* did change the indent, call changed_lines() later */ | |
| 741 if (first_changed == 0) | |
| 742 first_changed = curwin->w_cursor.lnum; | |
| 743 last_changed = curwin->w_cursor.lnum; | |
| 744 } | |
| 745 } | |
| 746 ++curwin->w_cursor.lnum; | |
| 1550 | 747 curwin->w_cursor.col = 0; /* make sure it's valid */ |
| 7 | 748 } |
| 749 | |
| 750 /* put cursor on first non-blank of indented line */ | |
| 751 curwin->w_cursor.lnum = start_lnum; | |
| 752 beginline(BL_SOL | BL_FIX); | |
| 753 | |
| 754 /* Mark changed lines so that they will be redrawn. When Visual | |
| 755 * highlighting was present, need to continue until the last line. When | |
| 756 * there is no change still need to remove the Visual highlighting. */ | |
| 757 if (last_changed != 0) | |
| 758 changed_lines(first_changed, 0, | |
| 759 oap->is_VIsual ? start_lnum + oap->line_count : | |
| 760 last_changed + 1, 0L); | |
| 761 else if (oap->is_VIsual) | |
| 762 redraw_curbuf_later(INVERTED); | |
| 763 | |
| 764 if (oap->line_count > p_report) | |
| 765 { | |
| 766 i = oap->line_count - (i + 1); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
767 smsg(NGETTEXT("%ld line indented ", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
768 "%ld lines indented ", i), i); |
| 7 | 769 } |
| 770 /* set '[ and '] marks */ | |
| 771 curbuf->b_op_start = oap->start; | |
| 772 curbuf->b_op_end = oap->end; | |
| 773 } | |
| 774 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
| 775 | |
| 776 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 777 /* | |
| 778 * Keep the last expression line here, for repeating. | |
| 779 */ | |
| 780 static char_u *expr_line = NULL; | |
| 781 | |
| 782 /* | |
| 783 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
| 784 * Returns '=' when OK, NUL otherwise. | |
| 785 */ | |
| 786 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
787 get_expr_register(void) |
| 7 | 788 { |
| 789 char_u *new_line; | |
| 790 | |
|
17178
40c4cb095d53
patch 8.1.1588: in :let-heredoc line continuation is recognized
Bram Moolenaar <Bram@vim.org>
parents:
17063
diff
changeset
|
791 new_line = getcmdline('=', 0L, 0, TRUE); |
| 7 | 792 if (new_line == NULL) |
| 793 return NUL; | |
| 794 if (*new_line == NUL) /* use previous line */ | |
| 795 vim_free(new_line); | |
| 796 else | |
| 797 set_expr_line(new_line); | |
| 798 return '='; | |
| 799 } | |
| 800 | |
| 801 /* | |
| 802 * Set the expression for the '=' register. | |
| 803 * Argument must be an allocated string. | |
| 804 */ | |
| 805 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
806 set_expr_line(char_u *new_line) |
| 7 | 807 { |
| 808 vim_free(expr_line); | |
| 809 expr_line = new_line; | |
| 810 } | |
| 811 | |
| 812 /* | |
| 813 * Get the result of the '=' register expression. | |
| 814 * Returns a pointer to allocated memory, or NULL for failure. | |
| 815 */ | |
| 816 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
817 get_expr_line(void) |
| 7 | 818 { |
| 819 char_u *expr_copy; | |
| 820 char_u *rv; | |
| 994 | 821 static int nested = 0; |
| 7 | 822 |
| 823 if (expr_line == NULL) | |
| 824 return NULL; | |
| 825 | |
| 826 /* Make a copy of the expression, because evaluating it may cause it to be | |
| 827 * changed. */ | |
| 828 expr_copy = vim_strsave(expr_line); | |
| 829 if (expr_copy == NULL) | |
| 830 return NULL; | |
| 831 | |
| 994 | 832 /* When we are invoked recursively limit the evaluation to 10 levels. |
| 833 * Then return the string as-is. */ | |
| 834 if (nested >= 10) | |
| 835 return expr_copy; | |
| 836 | |
| 837 ++nested; | |
| 714 | 838 rv = eval_to_string(expr_copy, NULL, TRUE); |
| 994 | 839 --nested; |
| 7 | 840 vim_free(expr_copy); |
| 841 return rv; | |
| 842 } | |
| 283 | 843 |
| 844 /* | |
| 845 * Get the '=' register expression itself, without evaluating it. | |
| 846 */ | |
| 847 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
848 get_expr_line_src(void) |
| 283 | 849 { |
| 850 if (expr_line == NULL) | |
| 851 return NULL; | |
| 852 return vim_strsave(expr_line); | |
| 853 } | |
| 7 | 854 #endif /* FEAT_EVAL */ |
| 855 | |
| 856 /* | |
| 857 * Check if 'regname' is a valid name of a yank register. | |
| 858 * Note: There is no check for 0 (default register), caller should do this | |
| 859 */ | |
| 860 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
861 valid_yank_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
862 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
863 int writing) /* if TRUE check for writable registers */ |
| 7 | 864 { |
| 865 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
| 866 || (!writing && vim_strchr((char_u *) | |
| 867 #ifdef FEAT_EVAL | |
| 6557 | 868 "/.%:=" |
| 7 | 869 #else |
| 6557 | 870 "/.%:" |
| 7 | 871 #endif |
| 872 , regname) != NULL) | |
| 6557 | 873 || regname == '#' |
| 7 | 874 || regname == '"' |
| 875 || regname == '-' | |
| 876 || regname == '_' | |
| 877 #ifdef FEAT_CLIPBOARD | |
| 878 || regname == '*' | |
| 879 || regname == '+' | |
| 880 #endif | |
| 881 #ifdef FEAT_DND | |
| 882 || (!writing && regname == '~') | |
| 883 #endif | |
| 884 ) | |
| 885 return TRUE; | |
| 886 return FALSE; | |
| 887 } | |
| 888 | |
| 889 /* | |
| 890 * Set y_current and y_append, according to the value of "regname". | |
| 891 * Cannot handle the '_' register. | |
| 140 | 892 * Must only be called with a valid register name! |
| 7 | 893 * |
| 894 * If regname is 0 and writing, use register 0 | |
| 895 * If regname is 0 and reading, use previous register | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
896 * |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
897 * Return TRUE when the register should be inserted literally (selection or |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
898 * clipboard). |
| 7 | 899 */ |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
900 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
901 get_yank_register(int regname, int writing) |
| 7 | 902 { |
| 903 int i; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
904 int ret = FALSE; |
| 7 | 905 |
| 906 y_append = FALSE; | |
| 907 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
| 908 { | |
| 909 y_current = y_previous; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
910 return ret; |
| 7 | 911 } |
| 912 i = regname; | |
| 913 if (VIM_ISDIGIT(i)) | |
| 914 i -= '0'; | |
| 915 else if (ASCII_ISLOWER(i)) | |
| 916 i = CharOrdLow(i) + 10; | |
| 917 else if (ASCII_ISUPPER(i)) | |
| 918 { | |
| 919 i = CharOrdUp(i) + 10; | |
| 920 y_append = TRUE; | |
| 921 } | |
| 922 else if (regname == '-') | |
| 923 i = DELETION_REGISTER; | |
| 924 #ifdef FEAT_CLIPBOARD | |
| 925 /* When selection is not available, use register 0 instead of '*' */ | |
| 926 else if (clip_star.available && regname == '*') | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
927 { |
| 7 | 928 i = STAR_REGISTER; |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
929 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
930 } |
| 7 | 931 /* When clipboard is not available, use register 0 instead of '+' */ |
| 932 else if (clip_plus.available && regname == '+') | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
933 { |
| 7 | 934 i = PLUS_REGISTER; |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
935 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
936 } |
| 7 | 937 #endif |
| 938 #ifdef FEAT_DND | |
| 939 else if (!writing && regname == '~') | |
| 940 i = TILDE_REGISTER; | |
| 941 #endif | |
| 942 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
| 943 i = 0; | |
| 944 y_current = &(y_regs[i]); | |
| 945 if (writing) /* remember the register we write into for do_put() */ | |
| 946 y_previous = y_current; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
947 return ret; |
| 7 | 948 } |
| 949 | |
| 15 | 950 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
| 7 | 951 /* |
| 952 * When "regname" is a clipboard register, obtain the selection. If it's not | |
| 953 * available return zero, otherwise return "regname". | |
| 954 */ | |
| 15 | 955 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
956 may_get_selection(int regname) |
| 7 | 957 { |
| 958 if (regname == '*') | |
| 959 { | |
| 960 if (!clip_star.available) | |
| 961 regname = 0; | |
| 962 else | |
| 963 clip_get_selection(&clip_star); | |
| 964 } | |
| 965 else if (regname == '+') | |
| 966 { | |
| 967 if (!clip_plus.available) | |
| 968 regname = 0; | |
| 969 else | |
| 970 clip_get_selection(&clip_plus); | |
| 971 } | |
| 972 return regname; | |
| 973 } | |
| 974 #endif | |
| 975 | |
| 976 /* | |
| 977 * Obtain the contents of a "normal" register. The register is made empty. | |
| 978 * The returned pointer has allocated memory, use put_register() later. | |
| 979 */ | |
| 980 void * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
981 get_register( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
982 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
983 int copy) /* make a copy, if FALSE make register empty. */ |
| 7 | 984 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
985 yankreg_T *reg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
986 int i; |
| 7 | 987 |
| 988 #ifdef FEAT_CLIPBOARD | |
| 989 /* When Visual area changed, may have to update selection. Obtain the | |
| 990 * selection too. */ | |
| 1435 | 991 if (name == '*' && clip_star.available) |
| 7 | 992 { |
| 3674 | 993 if (clip_isautosel_star()) |
| 994 clip_update_selection(&clip_star); | |
| 995 may_get_selection(name); | |
| 996 } | |
| 997 if (name == '+' && clip_plus.available) | |
| 998 { | |
| 999 if (clip_isautosel_plus()) | |
| 1000 clip_update_selection(&clip_plus); | |
| 7 | 1001 may_get_selection(name); |
| 1002 } | |
| 1003 #endif | |
| 1004 | |
| 1005 get_yank_register(name, 0); | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
1006 reg = ALLOC_ONE(yankreg_T); |
| 7 | 1007 if (reg != NULL) |
| 1008 { | |
| 1009 *reg = *y_current; | |
| 1010 if (copy) | |
| 1011 { | |
| 1012 /* If we run out of memory some or all of the lines are empty. */ | |
| 1013 if (reg->y_size == 0) | |
| 1014 reg->y_array = NULL; | |
| 1015 else | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
1016 reg->y_array = ALLOC_MULT(char_u *, reg->y_size); |
| 7 | 1017 if (reg->y_array != NULL) |
| 1018 { | |
| 1019 for (i = 0; i < reg->y_size; ++i) | |
| 1020 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
| 1021 } | |
| 1022 } | |
| 1023 else | |
| 1024 y_current->y_array = NULL; | |
| 1025 } | |
| 1026 return (void *)reg; | |
| 1027 } | |
| 1028 | |
| 1029 /* | |
| 1451 | 1030 * Put "reg" into register "name". Free any previous contents and "reg". |
| 7 | 1031 */ |
| 1032 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1033 put_register(int name, void *reg) |
| 7 | 1034 { |
| 1035 get_yank_register(name, 0); | |
| 1036 free_yank_all(); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1037 *y_current = *(yankreg_T *)reg; |
| 1451 | 1038 vim_free(reg); |
| 7 | 1039 |
| 5735 | 1040 #ifdef FEAT_CLIPBOARD |
| 7 | 1041 /* Send text written to clipboard register to the clipboard. */ |
| 1042 may_set_selection(); | |
| 5735 | 1043 #endif |
| 7 | 1044 } |
| 4209 | 1045 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1046 #if (defined(FEAT_CLIPBOARD) && defined(FEAT_X11) && defined(USE_SYSTEM)) \ |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1047 || defined(PROTO) |
| 4209 | 1048 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1049 free_register(void *reg) |
| 4209 | 1050 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1051 yankreg_T tmp; |
| 4209 | 1052 |
| 1053 tmp = *y_current; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1054 *y_current = *(yankreg_T *)reg; |
| 4209 | 1055 free_yank_all(); |
| 1056 vim_free(reg); | |
| 1057 *y_current = tmp; | |
| 1058 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1059 #endif |
| 7 | 1060 |
| 1061 #if defined(FEAT_MOUSE) || defined(PROTO) | |
| 1062 /* | |
| 1063 * return TRUE if the current yank register has type MLINE | |
| 1064 */ | |
| 1065 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1066 yank_register_mline(int regname) |
| 7 | 1067 { |
| 1068 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
| 1069 return FALSE; | |
| 1070 if (regname == '_') /* black hole is always empty */ | |
| 1071 return FALSE; | |
| 1072 get_yank_register(regname, FALSE); | |
| 1073 return (y_current->y_type == MLINE); | |
| 1074 } | |
| 1075 #endif | |
| 1076 | |
| 1077 /* | |
| 1157 | 1078 * Start or stop recording into a yank register. |
| 7 | 1079 * |
| 1157 | 1080 * Return FAIL for failure, OK otherwise. |
| 7 | 1081 */ |
| 1082 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1083 do_record(int c) |
| 7 | 1084 { |
| 1157 | 1085 char_u *p; |
| 1086 static int regname; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1087 yankreg_T *old_y_previous, *old_y_current; |
| 1157 | 1088 int retval; |
| 7 | 1089 |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1090 if (reg_recording == 0) /* start recording */ |
| 7 | 1091 { |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1092 /* registers 0-9, a-z and " are allowed */ |
| 7 | 1093 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
| 1094 retval = FAIL; | |
| 1095 else | |
| 1096 { | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1097 reg_recording = c; |
| 7 | 1098 showmode(); |
| 1099 regname = c; | |
| 1100 retval = OK; | |
| 1101 } | |
| 1102 } | |
| 1103 else /* stop recording */ | |
| 1104 { | |
| 1105 /* | |
| 1157 | 1106 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
| 1107 * needs to be removed again to put it in a register. exec_reg then | |
| 1108 * adds the escaping back later. | |
| 7 | 1109 */ |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1110 reg_recording = 0; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
1111 msg(""); |
| 7 | 1112 p = get_recorded(); |
| 1113 if (p == NULL) | |
| 1114 retval = FAIL; | |
| 1115 else | |
| 1116 { | |
| 1081 | 1117 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
| 1118 vim_unescape_csi(p); | |
| 1119 | |
| 7 | 1120 /* |
| 1121 * We don't want to change the default register here, so save and | |
| 1122 * restore the current register name. | |
| 1123 */ | |
| 1124 old_y_previous = y_previous; | |
| 1125 old_y_current = y_current; | |
| 1126 | |
| 1127 retval = stuff_yank(regname, p); | |
| 1128 | |
| 1129 y_previous = old_y_previous; | |
| 1130 y_current = old_y_current; | |
| 1131 } | |
| 1132 } | |
| 1133 return retval; | |
| 1134 } | |
| 1135 | |
| 1136 /* | |
| 1137 * Stuff string "p" into yank register "regname" as a single line (append if | |
| 1138 * uppercase). "p" must have been alloced. | |
| 1139 * | |
| 1140 * return FAIL for failure, OK otherwise | |
| 1141 */ | |
| 1142 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1143 stuff_yank(int regname, char_u *p) |
| 7 | 1144 { |
| 1145 char_u *lp; | |
| 1146 char_u **pp; | |
| 1147 | |
| 1148 /* check for read-only register */ | |
| 1149 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
| 1150 { | |
| 1151 vim_free(p); | |
| 1152 return FAIL; | |
| 1153 } | |
| 1154 if (regname == '_') /* black hole: don't do anything */ | |
| 1155 { | |
| 1156 vim_free(p); | |
| 1157 return OK; | |
| 1158 } | |
| 1159 get_yank_register(regname, TRUE); | |
| 1160 if (y_append && y_current->y_array != NULL) | |
| 1161 { | |
| 1162 pp = &(y_current->y_array[y_current->y_size - 1]); | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1163 lp = alloc(STRLEN(*pp) + STRLEN(p) + 1); |
| 7 | 1164 if (lp == NULL) |
| 1165 { | |
| 1166 vim_free(p); | |
| 1167 return FAIL; | |
| 1168 } | |
| 1169 STRCPY(lp, *pp); | |
| 1170 STRCAT(lp, p); | |
| 1171 vim_free(p); | |
| 1172 vim_free(*pp); | |
| 1173 *pp = lp; | |
| 1174 } | |
| 1175 else | |
| 1176 { | |
| 1177 free_yank_all(); | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
1178 if ((y_current->y_array = ALLOC_ONE(char_u *)) == NULL) |
| 7 | 1179 { |
| 1180 vim_free(p); | |
| 1181 return FAIL; | |
| 1182 } | |
| 1183 y_current->y_array[0] = p; | |
| 1184 y_current->y_size = 1; | |
| 1185 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
|
1186 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1187 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
|
1188 #endif |
| 7 | 1189 } |
| 1190 return OK; | |
| 1191 } | |
| 1192 | |
| 1893 | 1193 static int execreg_lastc = NUL; |
| 1194 | |
| 7 | 1195 /* |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1196 * Execute a yank register: copy it into the stuff buffer. |
| 7 | 1197 * |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1198 * Return FAIL for failure, OK otherwise. |
| 7 | 1199 */ |
| 1200 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1201 do_execreg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1202 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1203 int colon, /* insert ':' before each line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1204 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
|
1205 int silent) /* set "silent" flag in typeahead buffer */ |
| 7 | 1206 { |
| 1207 long i; | |
| 1208 char_u *p; | |
| 1209 int retval = OK; | |
| 1210 int remap; | |
| 1211 | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1212 // repeat previous one |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1213 if (regname == '@') |
| 168 | 1214 { |
| 1893 | 1215 if (execreg_lastc == NUL) |
| 168 | 1216 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1217 emsg(_("E748: No previously used register")); |
| 168 | 1218 return FAIL; |
| 1219 } | |
| 1893 | 1220 regname = execreg_lastc; |
| 168 | 1221 } |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1222 // check for valid regname |
| 7 | 1223 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) |
| 168 | 1224 { |
| 1225 emsg_invreg(regname); | |
| 7 | 1226 return FAIL; |
| 168 | 1227 } |
| 1893 | 1228 execreg_lastc = regname; |
| 7 | 1229 |
| 1230 #ifdef FEAT_CLIPBOARD | |
| 1231 regname = may_get_selection(regname); | |
| 1232 #endif | |
| 1233 | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1234 // black hole: don't stuff anything |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1235 if (regname == '_') |
| 7 | 1236 return OK; |
| 1237 | |
| 1238 #ifdef FEAT_CMDHIST | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1239 // use last command line |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1240 if (regname == ':') |
| 7 | 1241 { |
| 1242 if (last_cmdline == NULL) | |
| 1243 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1244 emsg(_(e_nolastcmd)); |
| 7 | 1245 return FAIL; |
| 1246 } | |
|
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1247 // don't keep the cmdline containing @: |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1248 VIM_CLEAR(new_last_cmdline); |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1249 // Escape all control characters with a CTRL-V |
| 16 | 1250 p = vim_strsave_escaped_ext(last_cmdline, |
|
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1251 (char_u *)"\001\002\003\004\005\006\007" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1252 "\010\011\012\013\014\015\016\017" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1253 "\020\021\022\023\024\025\026\027" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1254 "\030\031\032\033\034\035\036\037", |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1255 Ctrl_V, FALSE); |
| 16 | 1256 if (p != NULL) |
| 480 | 1257 { |
| 1258 /* When in Visual mode "'<,'>" will be prepended to the command. | |
| 1259 * Remove it when it's already there. */ | |
| 1260 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
| 1077 | 1261 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
| 480 | 1262 else |
| 1077 | 1263 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
| 480 | 1264 } |
| 16 | 1265 vim_free(p); |
| 7 | 1266 } |
| 1267 #endif | |
| 1268 #ifdef FEAT_EVAL | |
| 1269 else if (regname == '=') | |
| 1270 { | |
| 1271 p = get_expr_line(); | |
| 1272 if (p == NULL) | |
| 1273 return FAIL; | |
| 1077 | 1274 retval = put_in_typebuf(p, TRUE, colon, silent); |
| 7 | 1275 vim_free(p); |
| 1276 } | |
| 1277 #endif | |
| 1278 else if (regname == '.') /* use last inserted text */ | |
| 1279 { | |
| 1280 p = get_last_insert_save(); | |
| 1281 if (p == NULL) | |
| 1282 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1283 emsg(_(e_noinstext)); |
| 7 | 1284 return FAIL; |
| 1285 } | |
| 1077 | 1286 retval = put_in_typebuf(p, FALSE, colon, silent); |
| 7 | 1287 vim_free(p); |
| 1288 } | |
| 1289 else | |
| 1290 { | |
| 1291 get_yank_register(regname, FALSE); | |
| 1292 if (y_current->y_array == NULL) | |
| 1293 return FAIL; | |
| 1294 | |
| 1295 /* Disallow remaping for ":@r". */ | |
| 1296 remap = colon ? REMAP_NONE : REMAP_YES; | |
| 1297 | |
| 1298 /* | |
| 1299 * Insert lines into typeahead buffer, from last one to first one. | |
| 1300 */ | |
| 1034 | 1301 put_reedit_in_typebuf(silent); |
| 7 | 1302 for (i = y_current->y_size; --i >= 0; ) |
| 1303 { | |
| 1077 | 1304 char_u *escaped; |
| 1305 | |
| 7 | 1306 /* insert NL between lines and after last line if type is MLINE */ |
| 1307 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
| 1308 || addcr) | |
| 1309 { | |
| 1034 | 1310 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
| 7 | 1311 return FAIL; |
| 1312 } | |
| 1077 | 1313 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
| 1314 if (escaped == NULL) | |
| 1315 return FAIL; | |
| 1316 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
| 1317 vim_free(escaped); | |
| 1318 if (retval == FAIL) | |
| 7 | 1319 return FAIL; |
| 1034 | 1320 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
| 7 | 1321 == FAIL) |
| 1322 return FAIL; | |
| 1323 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1324 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
| 7 | 1325 } |
| 1326 return retval; | |
| 1327 } | |
| 1328 | |
| 1329 /* | |
| 1330 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
| 1331 * used only after other typeahead has been processed. | |
| 1332 */ | |
| 1333 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1334 put_reedit_in_typebuf(int silent) |
| 7 | 1335 { |
| 1336 char_u buf[3]; | |
| 1337 | |
| 1338 if (restart_edit != NUL) | |
| 1339 { | |
| 1340 if (restart_edit == 'V') | |
| 1341 { | |
| 1342 buf[0] = 'g'; | |
| 1343 buf[1] = 'R'; | |
| 1344 buf[2] = NUL; | |
| 1345 } | |
| 1346 else | |
| 1347 { | |
| 1348 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
| 1349 buf[1] = NUL; | |
| 1350 } | |
| 1034 | 1351 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
| 7 | 1352 restart_edit = NUL; |
| 1353 } | |
| 1354 } | |
| 1355 | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1356 /* |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1357 * 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
|
1358 * executed again. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1359 * 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
|
1360 * no remapping. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1361 */ |
| 7 | 1362 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1363 put_in_typebuf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1364 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1365 int esc, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1366 int colon, /* add ':' before the line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1367 int silent) |
| 7 | 1368 { |
| 1369 int retval = OK; | |
| 1370 | |
| 1034 | 1371 put_reedit_in_typebuf(silent); |
| 7 | 1372 if (colon) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1373 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1374 if (retval == OK) |
| 1077 | 1375 { |
| 1376 char_u *p; | |
| 1377 | |
| 1378 if (esc) | |
| 1379 p = vim_strsave_escape_csi(s); | |
| 1380 else | |
| 1381 p = s; | |
| 1382 if (p == NULL) | |
| 1383 retval = FAIL; | |
| 1384 else | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1385 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
|
1386 0, TRUE, silent); |
| 1077 | 1387 if (esc) |
| 1388 vim_free(p); | |
| 1389 } | |
| 7 | 1390 if (colon && retval == OK) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1391 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1392 return retval; |
| 1393 } | |
| 1394 | |
| 1395 /* | |
| 1396 * Insert a yank register: copy it into the Read buffer. | |
| 1397 * Used by CTRL-R command and middle mouse button in insert mode. | |
| 1398 * | |
| 1399 * return FAIL for failure, OK otherwise | |
| 1400 */ | |
| 1401 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1402 insert_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1403 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
|
1404 int literally_arg) /* insert literally, not as if typed */ |
| 7 | 1405 { |
| 1406 long i; | |
| 1407 int retval = OK; | |
| 1408 char_u *arg; | |
| 1409 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
|
1410 int literally = literally_arg; |
| 7 | 1411 |
| 1412 /* | |
| 1413 * It is possible to get into an endless loop by having CTRL-R a in | |
| 1414 * register a and then, in insert mode, doing CTRL-R a. | |
| 1415 * If you hit CTRL-C, the loop will be broken here. | |
| 1416 */ | |
| 1417 ui_breakcheck(); | |
| 1418 if (got_int) | |
| 1419 return FAIL; | |
| 1420 | |
| 1421 /* check for valid regname */ | |
| 1422 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 1423 return FAIL; | |
| 1424 | |
| 1425 #ifdef FEAT_CLIPBOARD | |
| 1426 regname = may_get_selection(regname); | |
| 1427 #endif | |
| 1428 | |
| 1429 if (regname == '.') /* insert last inserted text */ | |
| 1430 retval = stuff_inserted(NUL, 1L, TRUE); | |
| 1431 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
| 1432 { | |
| 1433 if (arg == NULL) | |
| 1434 return FAIL; | |
| 1435 stuffescaped(arg, literally); | |
| 1436 if (allocated) | |
| 1437 vim_free(arg); | |
| 1438 } | |
| 1439 else /* name or number register */ | |
| 1440 { | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1441 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
|
1442 literally = TRUE; |
| 7 | 1443 if (y_current->y_array == NULL) |
| 1444 retval = FAIL; | |
| 1445 else | |
| 1446 { | |
| 1447 for (i = 0; i < y_current->y_size; ++i) | |
| 1448 { | |
| 1449 stuffescaped(y_current->y_array[i], literally); | |
| 1450 /* | |
| 1451 * Insert a newline between lines and after last line if | |
| 1452 * y_type is MLINE. | |
| 1453 */ | |
| 1454 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 1455 stuffcharReadbuff('\n'); | |
| 1456 } | |
| 1457 } | |
| 1458 } | |
| 1459 | |
| 1460 return retval; | |
| 1461 } | |
| 1462 | |
| 1463 /* | |
| 1464 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
| 1465 * literally ("literally" TRUE) or interpret is as typed characters. | |
| 1466 */ | |
| 1467 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1468 stuffescaped(char_u *arg, int literally) |
| 7 | 1469 { |
| 1470 int c; | |
| 1471 char_u *start; | |
| 1472 | |
| 1473 while (*arg != NUL) | |
| 1474 { | |
| 1475 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
| 1476 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
| 1477 * is TRUE. */ | |
| 1478 start = arg; | |
| 1479 while ((*arg >= ' ' | |
| 1480 #ifndef EBCDIC | |
| 1481 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
| 1482 #endif | |
| 1483 ) | |
| 1484 || (*arg == K_SPECIAL && !literally)) | |
| 1485 ++arg; | |
| 1486 if (arg > start) | |
| 1487 stuffReadbuffLen(start, (long)(arg - start)); | |
| 1488 | |
| 1489 /* stuff a single special character */ | |
| 1490 if (*arg != NUL) | |
| 1491 { | |
| 1492 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
|
1493 c = mb_cptr2char_adv(&arg); |
| 7 | 1494 else |
| 1495 c = *arg++; | |
| 1496 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
| 1497 stuffcharReadbuff(Ctrl_V); | |
| 1498 stuffcharReadbuff(c); | |
| 1499 } | |
| 1500 } | |
| 1501 } | |
| 1502 | |
| 1503 /* | |
| 1157 | 1504 * If "regname" is a special register, return TRUE and store a pointer to its |
| 1505 * value in "argp". | |
| 7 | 1506 */ |
| 15 | 1507 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1508 get_spec_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1509 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1510 char_u **argp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1511 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
|
1512 int errmsg) /* give error message when failing */ |
| 7 | 1513 { |
| 1514 int cnt; | |
| 1515 | |
| 1516 *argp = NULL; | |
| 1517 *allocated = FALSE; | |
| 1518 switch (regname) | |
| 1519 { | |
| 1520 case '%': /* file name */ | |
| 1521 if (errmsg) | |
| 1522 check_fname(); /* will give emsg if not set */ | |
| 1523 *argp = curbuf->b_fname; | |
| 1524 return TRUE; | |
| 1525 | |
| 1526 case '#': /* alternate file name */ | |
| 1527 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
| 1528 return TRUE; | |
| 1529 | |
| 1530 #ifdef FEAT_EVAL | |
| 1531 case '=': /* result of expression */ | |
| 1532 *argp = get_expr_line(); | |
| 1533 *allocated = TRUE; | |
| 1534 return TRUE; | |
| 1535 #endif | |
| 1536 | |
| 1537 case ':': /* last command line */ | |
| 1538 if (last_cmdline == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1539 emsg(_(e_nolastcmd)); |
| 7 | 1540 *argp = last_cmdline; |
| 1541 return TRUE; | |
| 1542 | |
| 1543 case '/': /* last search-pattern */ | |
| 1544 if (last_search_pat() == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1545 emsg(_(e_noprevre)); |
| 7 | 1546 *argp = last_search_pat(); |
| 1547 return TRUE; | |
| 1548 | |
| 1549 case '.': /* last inserted text */ | |
| 1550 *argp = get_last_insert_save(); | |
| 1551 *allocated = TRUE; | |
| 1552 if (*argp == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1553 emsg(_(e_noinstext)); |
| 7 | 1554 return TRUE; |
| 1555 | |
| 1556 #ifdef FEAT_SEARCHPATH | |
| 1557 case Ctrl_F: /* Filename under cursor */ | |
| 1558 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 1559 if (!errmsg) | |
| 1560 return FALSE; | |
| 1561 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
| 681 | 1562 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
| 7 | 1563 *allocated = TRUE; |
| 1564 return TRUE; | |
| 1565 #endif | |
| 1566 | |
| 1567 case Ctrl_W: /* word under cursor */ | |
| 1568 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 1569 if (!errmsg) | |
| 1570 return FALSE; | |
| 1571 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
| 1572 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
| 1573 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
| 1574 *allocated = TRUE; | |
| 1575 return TRUE; | |
| 1576 | |
|
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1577 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
|
1578 if (!errmsg) |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1579 return FALSE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1581 *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
|
1582 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
|
1583 return TRUE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1584 |
| 7 | 1585 case '_': /* black hole: always empty */ |
| 1586 *argp = (char_u *)""; | |
| 1587 return TRUE; | |
| 1588 } | |
| 1589 | |
| 1590 return FALSE; | |
| 1591 } | |
| 1592 | |
| 1593 /* | |
| 15 | 1594 * Paste a yank register into the command line. |
| 1595 * Only for non-special registers. | |
| 1596 * Used by CTRL-R command in command-line mode | |
| 7 | 1597 * insert_reg() can't be used here, because special characters from the |
| 1598 * register contents will be interpreted as commands. | |
| 1599 * | |
| 1600 * return FAIL for failure, OK otherwise | |
| 1601 */ | |
| 1602 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1603 cmdline_paste_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1604 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
|
1605 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
|
1606 int remcr) /* don't add CR characters */ |
| 7 | 1607 { |
| 1608 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
|
1609 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
|
1610 |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1611 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
|
1612 literally = TRUE; |
| 7 | 1613 if (y_current->y_array == NULL) |
| 1614 return FAIL; | |
| 1615 | |
| 1616 for (i = 0; i < y_current->y_size; ++i) | |
| 1617 { | |
| 1618 cmdline_paste_str(y_current->y_array[i], literally); | |
| 1619 | |
| 1015 | 1620 /* 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
|
1621 * 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
|
1622 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
| 7 | 1623 cmdline_paste_str((char_u *)"\r", literally); |
| 1624 | |
| 1625 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
| 1626 * lines and gets bored. */ | |
| 1627 ui_breakcheck(); | |
| 1628 if (got_int) | |
| 1629 return FAIL; | |
| 1630 } | |
| 1631 return OK; | |
| 1632 } | |
| 1633 | |
| 1634 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 1635 /* | |
| 1636 * Adjust the register name pointed to with "rp" for the clipboard being | |
| 1637 * used always and the clipboard being available. | |
| 1638 */ | |
| 1639 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1640 adjust_clip_reg(int *rp) |
| 7 | 1641 { |
| 2654 | 1642 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
| 1643 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
| 6116 | 1644 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
| 1645 { | |
| 1646 if (clip_unnamed != 0) | |
| 1647 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 2654 | 1648 ? '+' : '*'; |
| 6116 | 1649 else |
| 1650 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 1651 ? '+' : '*'; | |
| 1652 } | |
| 7 | 1653 if (!clip_star.available && *rp == '*') |
| 1654 *rp = 0; | |
| 1655 if (!clip_plus.available && *rp == '+') | |
| 1656 *rp = 0; | |
| 1657 } | |
| 1658 #endif | |
| 1659 | |
| 1660 /* | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1661 * 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
|
1662 */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 void |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1664 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
|
1665 { |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1666 int n; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1667 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1668 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
|
1669 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
|
1670 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
|
1671 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
|
1672 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
|
1673 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
|
1674 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
|
1675 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
|
1676 } |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1677 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1678 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 static void |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1680 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
|
1681 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 static int recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 dict_T *v_event; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 list_T *list; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 int n; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 char_u buf[NUMBUFLEN + 2]; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 long reglen = 0; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 if (recursive) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 return; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 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
|
1693 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1694 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
|
1695 if (list == NULL) |
|
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1696 return; |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1697 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
|
1698 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
|
1699 list->lv_lock = VAR_FIXED; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 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
|
1701 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 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
|
1703 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
|
1704 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
|
1705 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 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
|
1707 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
|
1708 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
|
1709 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
|
1710 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 buf[0] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 buf[1] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1713 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
|
1714 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1715 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
|
1716 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
|
1717 case MBLOCK: |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1718 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
|
1719 reglen + 1); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 break; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1721 } |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1722 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
|
1723 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1724 /* 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
|
1725 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
|
1726 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 recursive = TRUE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 textlock++; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 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
|
1730 textlock--; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 /* 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
|
1734 dict_free_contents(v_event); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1735 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
|
1736 } |
|
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1737 #endif |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1738 |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1739 /* |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1740 * Handle a delete operation. |
| 7 | 1741 * |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1742 * Return FAIL if undo failed, OK otherwise. |
| 7 | 1743 */ |
| 1744 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1745 op_delete(oparg_T *oap) |
| 7 | 1746 { |
| 1747 int n; | |
| 1748 linenr_T lnum; | |
| 1749 char_u *ptr; | |
| 1750 char_u *newp, *oldp; | |
| 1751 struct block_def bd; | |
| 1752 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 1753 int did_yank = FALSE; | |
| 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 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1764 emsg(_(e_modifiable)); |
| 7 | 1765 return FAIL; |
| 1766 } | |
| 1767 | |
| 1768 #ifdef FEAT_CLIPBOARD | |
| 1769 adjust_clip_reg(&oap->regname); | |
| 1770 #endif | |
| 1771 | |
| 1772 if (has_mbyte) | |
| 1773 mb_adjust_opend(oap); | |
| 1774 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1775 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1776 * 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
|
1777 * 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
|
1778 * 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
|
1779 */ |
| 7 | 1780 if ( oap->motion_type == MCHAR |
| 1781 && !oap->is_VIsual | |
| 50 | 1782 && !oap->block_mode |
| 7 | 1783 && oap->line_count > 1 |
| 3254 | 1784 && oap->motion_force == NUL |
| 7 | 1785 && oap->op_type == OP_DELETE) |
| 1786 { | |
| 2957 | 1787 ptr = ml_get(oap->end.lnum) + oap->end.col; |
| 1788 if (*ptr != NUL) | |
| 1789 ptr += oap->inclusive; | |
| 7 | 1790 ptr = skipwhite(ptr); |
| 1791 if (*ptr == NUL && inindent(0)) | |
| 1792 oap->motion_type = MLINE; | |
| 1793 } | |
| 1794 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1795 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1796 * 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
|
1797 * 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
|
1798 */ |
| 7 | 1799 if ( oap->motion_type == MCHAR |
| 1800 && oap->line_count == 1 | |
| 1801 && oap->op_type == OP_DELETE | |
| 1802 && *ml_get(oap->start.lnum) == NUL) | |
| 1803 { | |
| 1804 /* | |
| 446 | 1805 * It's an error to operate on an empty region, when 'E' included in |
| 7 | 1806 * 'cpoptions' (Vi compatible). |
| 1807 */ | |
| 446 | 1808 if (virtual_op) |
| 1809 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
| 1810 * marks as if it happened. */ | |
| 1811 goto setmarks; | |
| 7 | 1812 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
| 1813 beep_flush(); | |
| 1814 return OK; | |
| 1815 } | |
| 1816 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1817 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1818 * 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
|
1819 * 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
|
1820 * 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
|
1821 */ |
| 7 | 1822 if (oap->regname != '_') |
| 1823 { | |
| 1824 if (oap->regname != 0) | |
| 1825 { | |
| 1826 /* check for read-only register */ | |
| 1827 if (!valid_yank_reg(oap->regname, TRUE)) | |
| 1828 { | |
| 1829 beep_flush(); | |
| 1830 return OK; | |
| 1831 } | |
| 1832 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
| 1833 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
| 1834 did_yank = TRUE; | |
| 1835 } | |
| 1836 | |
| 1837 /* | |
| 1838 * Put deleted text into register 1 and shift number registers if the | |
|
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1839 * delete contains a line break, or when using a specific operator (Vi |
|
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1840 * compatible) |
| 3782 | 1841 * Use the register name from before adjust_clip_reg() may have |
| 1842 * changed it. | |
| 7 | 1843 */ |
|
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1844 if (oap->motion_type == MLINE || oap->line_count > 1 |
|
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1845 || oap->use_reg_one) |
| 7 | 1846 { |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1847 shift_delete_registers(); |
| 7 | 1848 if (op_yank(oap, TRUE, FALSE) == OK) |
| 1849 did_yank = TRUE; | |
| 1850 } | |
| 1851 | |
| 3468 | 1852 /* Yank into small delete register when no named register specified |
| 1853 * and the delete is within one line. */ | |
| 1854 if (( | |
| 1855 #ifdef FEAT_CLIPBOARD | |
| 3584 | 1856 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
| 1857 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
| 3468 | 1858 #endif |
| 1859 oap->regname == 0) && oap->motion_type != MLINE | |
| 7 | 1860 && oap->line_count == 1) |
| 1861 { | |
| 1862 oap->regname = '-'; | |
| 1863 get_yank_register(oap->regname, TRUE); | |
| 1864 if (op_yank(oap, TRUE, FALSE) == OK) | |
| 1865 did_yank = TRUE; | |
| 1866 oap->regname = 0; | |
| 1867 } | |
| 1868 | |
| 1869 /* | |
| 1870 * If there's too much stuff to fit in the yank register, then get a | |
| 1871 * confirmation before doing the delete. This is crude, but simple. | |
| 1872 * And it avoids doing a delete of something we can't put back if we | |
| 1873 * want. | |
| 1874 */ | |
| 1875 if (!did_yank) | |
| 1876 { | |
| 1877 int msg_silent_save = msg_silent; | |
| 1878 | |
| 1879 msg_silent = 0; /* must display the prompt */ | |
| 1880 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
| 1881 msg_silent = msg_silent_save; | |
| 1882 if (n != 'y') | |
| 1883 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1884 emsg(_(e_abort)); |
| 7 | 1885 return FAIL; |
| 1886 } | |
| 1887 } | |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1888 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1889 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1890 if (did_yank && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1891 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
|
1892 #endif |
| 7 | 1893 } |
| 1894 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1895 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1896 * 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
|
1897 */ |
| 7 | 1898 if (oap->block_mode) |
| 1899 { | |
| 1900 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 1901 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1902 return FAIL; | |
| 1903 | |
| 1904 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
| 1905 { | |
| 1906 block_prep(oap, &bd, lnum, TRUE); | |
| 1907 if (bd.textlen == 0) /* nothing to delete */ | |
| 1908 continue; | |
| 1909 | |
| 1910 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
| 1911 if (lnum == curwin->w_cursor.lnum) | |
| 1912 { | |
| 1913 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
| 1914 curwin->w_cursor.coladd = 0; | |
| 1915 } | |
| 1916 | |
|
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1917 // "n" == number of chars deleted |
|
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1918 // If we delete a TAB, it may be replaced by several characters. |
|
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1919 // Thus the number of characters may increase! |
| 7 | 1920 n = bd.textlen - bd.startspaces - bd.endspaces; |
| 1921 oldp = ml_get(lnum); | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
1922 newp = alloc(STRLEN(oldp) + 1 - n); |
| 7 | 1923 if (newp == NULL) |
| 1924 continue; | |
| 1925 /* copy up to deleted part */ | |
| 1926 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 1927 /* insert spaces */ | |
| 6929 | 1928 vim_memset(newp + bd.textcol, ' ', |
| 7 | 1929 (size_t)(bd.startspaces + bd.endspaces)); |
| 1930 /* copy the part after the deleted part */ | |
| 1931 oldp += bd.textcol + bd.textlen; | |
| 1622 | 1932 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
| 7 | 1933 /* replace the line */ |
| 1934 ml_replace(lnum, newp, FALSE); | |
|
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1935 |
|
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1936 #ifdef FEAT_TEXT_PROP |
|
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1937 if (curbuf->b_has_textprop && n != 0) |
|
16714
ba592f30c082
patch 8.1.1359: text property wrong after :substitute with backslash
Bram Moolenaar <Bram@vim.org>
parents:
16706
diff
changeset
|
1938 adjust_prop_columns(lnum, bd.textcol, -n, 0); |
|
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1939 #endif |
| 7 | 1940 } |
| 1941 | |
| 1942 check_cursor_col(); | |
| 1943 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1944 oap->end.lnum + 1, 0L); | |
| 1945 oap->line_count = 0; /* no lines deleted */ | |
| 1946 } | |
| 5735 | 1947 else if (oap->motion_type == MLINE) |
| 7 | 1948 { |
| 1949 if (oap->op_type == OP_CHANGE) | |
| 1950 { | |
| 1951 /* Delete the lines except the first one. Temporarily move the | |
| 1952 * cursor to the next line. Save the current line number, if the | |
| 1953 * last line is deleted it may be changed. | |
| 1954 */ | |
| 1955 if (oap->line_count > 1) | |
| 1956 { | |
| 1957 lnum = curwin->w_cursor.lnum; | |
| 1958 ++curwin->w_cursor.lnum; | |
| 1959 del_lines((long)(oap->line_count - 1), TRUE); | |
| 1960 curwin->w_cursor.lnum = lnum; | |
| 1961 } | |
| 1962 if (u_save_cursor() == FAIL) | |
| 1963 return FAIL; | |
| 1964 if (curbuf->b_p_ai) /* don't delete indent */ | |
| 1965 { | |
| 1966 beginline(BL_WHITE); /* cursor on first non-white */ | |
| 1967 did_ai = TRUE; /* delete the indent when ESC hit */ | |
| 1968 ai_col = curwin->w_cursor.col; | |
| 1969 } | |
| 1970 else | |
| 1971 beginline(0); /* cursor in column 0 */ | |
| 1972 truncate_line(FALSE); /* delete the rest of the line */ | |
| 1973 /* leave cursor past last char in line */ | |
| 1974 if (oap->line_count > 1) | |
| 1975 u_clearline(); /* "U" command not possible after "2cc" */ | |
| 1976 } | |
| 1977 else | |
| 1978 { | |
| 1979 del_lines(oap->line_count, TRUE); | |
| 1980 beginline(BL_WHITE | BL_FIX); | |
| 1981 u_clearline(); /* "U" command not possible after "dd" */ | |
| 1982 } | |
| 1983 } | |
| 1984 else | |
| 1985 { | |
| 1986 if (virtual_op) | |
| 1987 { | |
| 1988 int endcol = 0; | |
| 1989 | |
| 1990 /* For virtualedit: break the tabs that are partly included. */ | |
| 1991 if (gchar_pos(&oap->start) == '\t') | |
| 1992 { | |
| 1993 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
| 1994 return FAIL; | |
| 1995 if (oap->line_count == 1) | |
| 1996 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
| 1997 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
| 1998 oap->start = curwin->w_cursor; | |
| 1999 if (oap->line_count == 1) | |
| 2000 { | |
| 2001 coladvance(endcol); | |
| 2002 oap->end.col = curwin->w_cursor.col; | |
| 2003 oap->end.coladd = curwin->w_cursor.coladd; | |
| 2004 curwin->w_cursor = oap->start; | |
| 2005 } | |
| 2006 } | |
| 2007 | |
| 2008 /* Break a tab only when it's included in the area. */ | |
| 2009 if (gchar_pos(&oap->end) == '\t' | |
| 2010 && (int)oap->end.coladd < oap->inclusive) | |
| 2011 { | |
| 2012 /* save last line for undo */ | |
| 2013 if (u_save((linenr_T)(oap->end.lnum - 1), | |
| 2014 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2015 return FAIL; | |
| 2016 curwin->w_cursor = oap->end; | |
| 2017 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
| 2018 oap->end = curwin->w_cursor; | |
| 2019 curwin->w_cursor = oap->start; | |
| 2020 } | |
| 2021 } | |
| 2022 | |
| 2023 if (oap->line_count == 1) /* delete characters within one line */ | |
| 2024 { | |
| 2025 if (u_save_cursor() == FAIL) /* save line for undo */ | |
| 2026 return FAIL; | |
| 2027 | |
| 2028 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
| 5735 | 2029 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
| 7 | 2030 && oap->op_type == OP_CHANGE |
| 2031 && oap->end.lnum == curwin->w_cursor.lnum | |
| 5735 | 2032 && !oap->is_VIsual) |
| 7 | 2033 display_dollar(oap->end.col - !oap->inclusive); |
| 2034 | |
| 2035 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
| 2036 | |
| 2037 if (virtual_op) | |
| 2038 { | |
| 2039 /* fix up things for virtualedit-delete: | |
| 2040 * break the tabs which are going to get in our way | |
| 2041 */ | |
| 2042 char_u *curline = ml_get_curline(); | |
| 2043 int len = (int)STRLEN(curline); | |
| 2044 | |
| 2045 if (oap->end.coladd != 0 | |
| 2046 && (int)oap->end.col >= len - 1 | |
| 2047 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
| 2048 n++; | |
| 2049 /* Delete at least one char (e.g, when on a control char). */ | |
| 2050 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
| 2051 n = 1; | |
| 2052 | |
| 2053 /* When deleted a char in the line, reset coladd. */ | |
| 2054 if (gchar_cursor() != NUL) | |
| 2055 curwin->w_cursor.coladd = 0; | |
| 2056 } | |
| 6826 | 2057 (void)del_bytes((long)n, !virtual_op, |
| 2058 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 7 | 2059 } |
| 2060 else /* delete characters between lines */ | |
| 2061 { | |
| 2062 pos_T curpos; | |
| 2063 | |
| 2064 /* save deleted and changed lines for undo */ | |
| 2065 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
| 2066 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
| 2067 return FAIL; | |
| 2068 | |
| 2069 truncate_line(TRUE); /* delete from cursor to end of line */ | |
| 2070 | |
| 2071 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
| 2072 ++curwin->w_cursor.lnum; | |
| 2073 del_lines((long)(oap->line_count - 2), FALSE); | |
| 2074 | |
| 6826 | 2075 /* delete from start of line until op_end */ |
| 2957 | 2076 n = (oap->end.col + 1 - !oap->inclusive); |
| 6826 | 2077 curwin->w_cursor.col = 0; |
| 2078 (void)del_bytes((long)n, !virtual_op, | |
| 2079 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 2080 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
| 2081 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
| 7 | 2082 } |
| 2083 } | |
| 2084 | |
| 2085 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
| 2086 | |
| 446 | 2087 setmarks: |
| 7 | 2088 if (oap->block_mode) |
| 2089 { | |
| 2090 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 2091 curbuf->b_op_end.col = oap->start.col; | |
| 2092 } | |
| 2093 else | |
| 2094 curbuf->b_op_end = oap->start; | |
| 2095 curbuf->b_op_start = oap->start; | |
| 2096 | |
| 2097 return OK; | |
| 2098 } | |
| 2099 | |
| 2100 /* | |
| 2101 * Adjust end of operating area for ending on a multi-byte character. | |
| 2102 * Used for deletion. | |
| 2103 */ | |
| 2104 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2105 mb_adjust_opend(oparg_T *oap) |
| 7 | 2106 { |
| 2107 char_u *p; | |
| 2108 | |
| 2109 if (oap->inclusive) | |
| 2110 { | |
| 2111 p = ml_get(oap->end.lnum); | |
| 2112 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
| 2113 } | |
| 2114 } | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
2115 |
|
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
|
2116 /* |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2117 * 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
|
2118 * 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
|
2119 */ |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2120 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
|
2121 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
|
2122 { |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2123 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
|
2124 |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2125 State = 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
|
2126 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
|
2127 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
|
2128 /* 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
|
2129 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
|
2130 } |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2131 |
| 7 | 2132 /* |
| 2133 * Replace a whole area with one character. | |
| 2134 */ | |
| 2135 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2136 op_replace(oparg_T *oap, int c) |
| 7 | 2137 { |
| 2138 int n, numc; | |
| 2139 int num_chars; | |
| 2140 char_u *newp, *oldp; | |
| 2141 size_t oldlen; | |
| 2142 struct block_def bd; | |
| 5428 | 2143 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
|
2144 int had_ctrl_v_cr = FALSE; |
| 7 | 2145 |
| 2146 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
| 2147 return OK; /* nothing to do */ | |
| 2148 | |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2149 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
|
2150 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2151 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
|
2152 c = CAR; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2153 } |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2154 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
|
2155 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2156 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
|
2157 c = NL; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2158 } |
| 5428 | 2159 |
| 7 | 2160 if (has_mbyte) |
| 2161 mb_adjust_opend(oap); | |
| 2162 | |
| 2163 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2164 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2165 return FAIL; | |
| 2166 | |
| 2167 /* | |
| 2168 * block mode replace | |
| 2169 */ | |
| 2170 if (oap->block_mode) | |
| 2171 { | |
| 2172 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2173 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
| 2174 { | |
| 1982 | 2175 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
| 7 | 2176 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
| 2177 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
| 2178 continue; /* nothing to replace */ | |
| 2179 | |
| 2180 /* n == number of extra chars required | |
| 2181 * If we split a TAB, it may be replaced by several characters. | |
| 2182 * Thus the number of characters may increase! | |
| 2183 */ | |
| 2184 /* If the range starts in virtual space, count the initial | |
| 2185 * coladd offset as part of "startspaces" */ | |
| 2186 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
| 2187 { | |
| 2188 pos_T vpos; | |
| 2189 | |
| 1982 | 2190 vpos.lnum = curwin->w_cursor.lnum; |
| 7 | 2191 getvpos(&vpos, oap->start_vcol); |
| 2192 bd.startspaces += vpos.coladd; | |
| 2193 n = bd.startspaces; | |
| 2194 } | |
| 2195 else | |
| 2196 /* allow for pre spaces */ | |
| 2197 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
| 2198 | |
| 2199 /* allow for post spp */ | |
| 2200 n += (bd.endspaces | |
| 2201 && !bd.is_oneChar | |
| 2202 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
| 2203 /* Figure out how many characters to replace. */ | |
| 2204 numc = oap->end_vcol - oap->start_vcol + 1; | |
| 2205 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
| 2206 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
| 2207 | |
| 2208 /* A double-wide character can be replaced only up to half the | |
| 2209 * times. */ | |
| 2210 if ((*mb_char2cells)(c) > 1) | |
| 2211 { | |
| 2212 if ((numc & 1) && !bd.is_short) | |
| 2213 { | |
| 2214 ++bd.endspaces; | |
| 2215 ++n; | |
| 2216 } | |
| 2217 numc = numc / 2; | |
| 2218 } | |
| 2219 | |
| 2220 /* Compute bytes needed, move character count to num_chars. */ | |
| 2221 num_chars = numc; | |
| 2222 numc *= (*mb_char2len)(c); | |
| 2223 /* oldlen includes textlen, so don't double count */ | |
| 2224 n += numc - bd.textlen; | |
| 2225 | |
| 2226 oldp = ml_get_curline(); | |
| 2227 oldlen = STRLEN(oldp); | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2228 newp = alloc(oldlen + 1 + n); |
| 7 | 2229 if (newp == NULL) |
| 2230 continue; | |
| 2231 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
| 2232 /* copy up to deleted part */ | |
| 2233 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2234 oldp += bd.textcol + bd.textlen; | |
| 2235 /* insert pre-spaces */ | |
| 6929 | 2236 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
| 7 | 2237 /* 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
|
2238 /* 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
|
2239 * literally. */ |
| 5428 | 2240 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
| 7 | 2241 { |
| 5428 | 2242 if (has_mbyte) |
| 2243 { | |
| 2244 n = (int)STRLEN(newp); | |
| 2245 while (--num_chars >= 0) | |
| 2246 n += (*mb_char2bytes)(c, newp + n); | |
| 2247 } | |
| 2248 else | |
| 6929 | 2249 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
| 5428 | 2250 if (!bd.is_short) |
| 2251 { | |
| 2252 /* insert post-spaces */ | |
| 6929 | 2253 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
| 5428 | 2254 /* copy the part after the changed part */ |
| 2255 STRMOVE(newp + STRLEN(newp), oldp); | |
| 2256 } | |
| 7 | 2257 } |
| 2258 else | |
| 2259 { | |
| 5428 | 2260 /* Replacing with \r or \n means splitting the line. */ |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2261 after_p = alloc(oldlen + 1 + n - STRLEN(newp)); |
| 5428 | 2262 if (after_p != NULL) |
| 2263 STRMOVE(after_p, oldp); | |
| 7 | 2264 } |
| 2265 /* replace the line */ | |
| 2266 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 5428 | 2267 if (after_p != NULL) |
| 2268 { | |
| 2269 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
| 2270 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
| 2271 oap->end.lnum++; | |
| 2272 vim_free(after_p); | |
| 2273 } | |
| 7 | 2274 } |
| 2275 } | |
| 2276 else | |
| 2277 { | |
| 2278 /* | |
| 2279 * MCHAR and MLINE motion replace. | |
| 2280 */ | |
| 2281 if (oap->motion_type == MLINE) | |
| 2282 { | |
| 2283 oap->start.col = 0; | |
| 2284 curwin->w_cursor.col = 0; | |
| 2285 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2286 if (oap->end.col) | |
| 2287 --oap->end.col; | |
| 2288 } | |
| 2289 else if (!oap->inclusive) | |
| 2290 dec(&(oap->end)); | |
| 2291 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2292 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
| 7 | 2293 { |
| 2294 n = gchar_cursor(); | |
| 2295 if (n != NUL) | |
| 2296 { | |
| 2297 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
| 2298 { | |
| 2299 /* This is slow, but it handles replacing a single-byte | |
| 2300 * with a multi-byte and the other way around. */ | |
| 4203 | 2301 if (curwin->w_cursor.lnum == oap->end.lnum) |
| 2302 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
|
2303 replace_character(c); |
| 7 | 2304 } |
| 2305 else | |
| 2306 { | |
| 2307 if (n == TAB) | |
| 2308 { | |
| 2309 int end_vcol = 0; | |
| 2310 | |
| 2311 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2312 { | |
| 2313 /* oap->end has to be recalculated when | |
| 2314 * the tab breaks */ | |
| 2315 end_vcol = getviscol2(oap->end.col, | |
| 2316 oap->end.coladd); | |
| 2317 } | |
| 2318 coladvance_force(getviscol()); | |
| 2319 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2320 getvpos(&oap->end, end_vcol); | |
| 2321 } | |
|
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
|
2322 PBYTE(curwin->w_cursor, c); |
| 7 | 2323 } |
| 2324 } | |
| 2325 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
| 2326 { | |
| 2327 int virtcols = oap->end.coladd; | |
| 2328 | |
| 2329 if (curwin->w_cursor.lnum == oap->start.lnum | |
| 2330 && oap->start.col == oap->end.col && oap->start.coladd) | |
| 2331 virtcols -= oap->start.coladd; | |
| 2332 | |
| 2333 /* oap->end has been trimmed so it's effectively inclusive; | |
| 2334 * as a result an extra +1 must be counted so we don't | |
| 2335 * trample the NUL byte. */ | |
| 2336 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
| 2337 curwin->w_cursor.col -= (virtcols + 1); | |
| 2338 for (; virtcols >= 0; virtcols--) | |
| 2339 { | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2340 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
|
2341 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
|
2342 else |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2343 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
|
2344 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
|
2345 break; |
| 7 | 2346 } |
| 2347 } | |
| 2348 | |
| 2349 /* Advance to next character, stop at the end of the file. */ | |
| 2350 if (inc_cursor() == -1) | |
| 2351 break; | |
| 2352 } | |
| 2353 } | |
| 2354 | |
| 2355 curwin->w_cursor = oap->start; | |
| 2356 check_cursor(); | |
| 2357 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
| 2358 | |
| 2359 /* Set "'[" and "']" marks. */ | |
| 2360 curbuf->b_op_start = oap->start; | |
| 2361 curbuf->b_op_end = oap->end; | |
| 2362 | |
| 2363 return OK; | |
| 2364 } | |
| 2365 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2366 static int swapchars(int op_type, pos_T *pos, int length); |
| 1525 | 2367 |
| 7 | 2368 /* |
| 2369 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
| 2370 */ | |
| 2371 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2372 op_tilde(oparg_T *oap) |
| 7 | 2373 { |
| 2374 pos_T pos; | |
| 2375 struct block_def bd; | |
| 1528 | 2376 int did_change = FALSE; |
| 7 | 2377 |
| 2378 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2379 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2380 return; | |
| 2381 | |
| 2382 pos = oap->start; | |
| 2383 if (oap->block_mode) /* Visual block mode */ | |
| 2384 { | |
| 2385 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
| 2386 { | |
| 1766 | 2387 int one_change; |
| 2388 | |
| 7 | 2389 block_prep(oap, &bd, pos.lnum, FALSE); |
| 2390 pos.col = bd.textcol; | |
| 1766 | 2391 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
| 2392 did_change |= one_change; | |
| 1525 | 2393 |
| 5735 | 2394 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 2395 if (netbeans_active() && one_change) |
| 7 | 2396 { |
| 2397 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2398 | |
| 33 | 2399 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
| 2400 (long)bd.textlen); | |
| 7 | 2401 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
| 2210 | 2402 &ptr[bd.textcol], bd.textlen); |
| 7 | 2403 } |
| 5735 | 2404 #endif |
| 7 | 2405 } |
| 2406 if (did_change) | |
| 2407 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 2408 } | |
| 2409 else /* not block mode */ | |
| 2410 { | |
| 2411 if (oap->motion_type == MLINE) | |
| 2412 { | |
| 2413 oap->start.col = 0; | |
| 2414 pos.col = 0; | |
| 2415 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2416 if (oap->end.col) | |
| 2417 --oap->end.col; | |
| 2418 } | |
| 2419 else if (!oap->inclusive) | |
| 2420 dec(&(oap->end)); | |
| 2421 | |
| 1528 | 2422 if (pos.lnum == oap->end.lnum) |
| 2423 did_change = swapchars(oap->op_type, &pos, | |
| 2424 oap->end.col - pos.col + 1); | |
| 2425 else | |
| 2426 for (;;) | |
| 2427 { | |
| 2428 did_change |= swapchars(oap->op_type, &pos, | |
| 2429 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
| 2430 (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
|
2431 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
| 1528 | 2432 break; |
| 2433 } | |
| 7 | 2434 if (did_change) |
| 2435 { | |
| 2436 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
| 2437 0L); | |
| 2438 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2439 if (netbeans_active() && did_change) |
| 7 | 2440 { |
| 2441 char_u *ptr; | |
| 2442 int count; | |
| 2443 | |
| 2444 pos = oap->start; | |
| 2445 while (pos.lnum < oap->end.lnum) | |
| 2446 { | |
| 2447 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 835 | 2448 count = (int)STRLEN(ptr) - pos.col; |
| 33 | 2449 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2450 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2451 &ptr[pos.col], count); |
| 7 | 2452 pos.col = 0; |
| 2453 pos.lnum++; | |
| 2454 } | |
| 2455 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2456 count = oap->end.col - pos.col + 1; | |
| 33 | 2457 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2458 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2459 &ptr[pos.col], count); |
| 7 | 2460 } |
| 2461 #endif | |
| 2462 } | |
| 2463 } | |
| 2464 | |
| 2465 if (!did_change && oap->is_VIsual) | |
| 2466 /* No change: need to remove the Visual selection */ | |
| 2467 redraw_curbuf_later(INVERTED); | |
| 2468 | |
| 2469 /* | |
| 2470 * Set '[ and '] marks. | |
| 2471 */ | |
| 2472 curbuf->b_op_start = oap->start; | |
| 2473 curbuf->b_op_end = oap->end; | |
| 2474 | |
| 2475 if (oap->line_count > p_report) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2476 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
2477 oap->line_count), oap->line_count); |
| 7 | 2478 } |
| 2479 | |
| 2480 /* | |
| 1525 | 2481 * Invoke swapchar() on "length" bytes at position "pos". |
| 2482 * "pos" is advanced to just after the changed characters. | |
| 2483 * "length" is rounded up to include the whole last multi-byte character. | |
| 2484 * Also works correctly when the number of bytes changes. | |
| 2485 * Returns TRUE if some character was changed. | |
| 2486 */ | |
| 2487 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2488 swapchars(int op_type, pos_T *pos, int length) |
| 1525 | 2489 { |
| 2490 int todo; | |
| 2491 int did_change = 0; | |
| 2492 | |
| 2493 for (todo = length; todo > 0; --todo) | |
| 2494 { | |
| 2495 if (has_mbyte) | |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2496 { |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2497 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2498 |
| 1525 | 2499 /* we're counting bytes, not characters */ |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2500 if (len > 0) |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2501 todo -= len - 1; |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2502 } |
| 1525 | 2503 did_change |= swapchar(op_type, pos); |
| 2504 if (inc(pos) == -1) /* at end of file */ | |
| 2505 break; | |
| 2506 } | |
| 2507 return did_change; | |
| 2508 } | |
| 2509 | |
| 2510 /* | |
| 7 | 2511 * If op_type == OP_UPPER: make uppercase, |
| 2512 * if op_type == OP_LOWER: make lowercase, | |
| 2513 * if op_type == OP_ROT13: do rot13 encoding, | |
| 2514 * else swap case of character at 'pos' | |
| 2515 * returns TRUE when something actually changed. | |
| 2516 */ | |
| 2517 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2518 swapchar(int op_type, pos_T *pos) |
| 7 | 2519 { |
| 2520 int c; | |
| 2521 int nc; | |
| 2522 | |
| 2523 c = gchar_pos(pos); | |
| 2524 | |
| 2525 /* Only do rot13 encoding for ASCII characters. */ | |
| 2526 if (c >= 0x80 && op_type == OP_ROT13) | |
| 2527 return FALSE; | |
| 2528 | |
| 1525 | 2529 if (op_type == OP_UPPER && c == 0xdf |
| 2530 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
| 493 | 2531 { |
| 2532 pos_T sp = curwin->w_cursor; | |
| 2533 | |
| 2534 /* Special handling of German sharp s: change to "SS". */ | |
| 2535 curwin->w_cursor = *pos; | |
| 2536 del_char(FALSE); | |
| 2537 ins_char('S'); | |
| 2538 ins_char('S'); | |
| 2539 curwin->w_cursor = sp; | |
| 2540 inc(pos); | |
| 2541 } | |
| 2542 | |
| 7 | 2543 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
| 2544 return FALSE; | |
| 2545 nc = c; | |
| 2546 if (MB_ISLOWER(c)) | |
| 2547 { | |
| 2548 if (op_type == OP_ROT13) | |
| 2549 nc = ROT13(c, 'a'); | |
| 2550 else if (op_type != OP_LOWER) | |
| 2551 nc = MB_TOUPPER(c); | |
| 2552 } | |
| 2553 else if (MB_ISUPPER(c)) | |
| 2554 { | |
| 2555 if (op_type == OP_ROT13) | |
| 2556 nc = ROT13(c, 'A'); | |
| 2557 else if (op_type != OP_UPPER) | |
| 2558 nc = MB_TOLOWER(c); | |
| 2559 } | |
| 2560 if (nc != c) | |
| 2561 { | |
| 2562 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
| 2563 { | |
| 2564 pos_T sp = curwin->w_cursor; | |
| 2565 | |
| 2566 curwin->w_cursor = *pos; | |
|
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2567 /* 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
|
2568 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
| 7 | 2569 ins_char(nc); |
| 2570 curwin->w_cursor = sp; | |
| 2571 } | |
| 2572 else | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2573 PBYTE(*pos, nc); |
| 7 | 2574 return TRUE; |
| 2575 } | |
| 2576 return FALSE; | |
| 2577 } | |
| 2578 | |
| 2579 /* | |
| 2580 * op_insert - Insert and append operators for Visual mode. | |
| 2581 */ | |
| 2582 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2583 op_insert(oparg_T *oap, long count1) |
| 7 | 2584 { |
| 2585 long ins_len, pre_textlen = 0; | |
| 2586 char_u *firstline, *ins_text; | |
|
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2587 colnr_T ind_pre = 0, ind_post; |
| 7 | 2588 struct block_def bd; |
| 2589 int i; | |
| 6579 | 2590 pos_T t1; |
| 7 | 2591 |
| 2592 /* edit() changes this - record it for OP_APPEND */ | |
| 2593 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2594 | |
| 2595 /* vis block is still marked. Get rid of it now. */ | |
| 2596 curwin->w_cursor.lnum = oap->start.lnum; | |
| 2597 update_screen(INVERTED); | |
| 2598 | |
| 2599 if (oap->block_mode) | |
| 2600 { | |
| 2601 /* When 'virtualedit' is used, need to insert the extra spaces before | |
| 2602 * doing block_prep(). When only "block" is used, virtual edit is | |
| 2603 * already disabled, but still need it when calling | |
| 2604 * coladvance_force(). */ | |
| 2605 if (curwin->w_cursor.coladd > 0) | |
| 2606 { | |
| 2607 int old_ve_flags = ve_flags; | |
| 2608 | |
| 2609 ve_flags = VE_ALL; | |
| 2610 if (u_save_cursor() == FAIL) | |
| 2611 return; | |
| 2612 coladvance_force(oap->op_type == OP_APPEND | |
| 2613 ? oap->end_vcol + 1 : getviscol()); | |
| 2614 if (oap->op_type == OP_APPEND) | |
| 2615 --curwin->w_cursor.col; | |
| 2616 ve_flags = old_ve_flags; | |
| 2617 } | |
| 2618 /* Get the info about the block before entering the text */ | |
| 2619 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
|
2620 /* 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
|
2621 ind_pre = (colnr_T)getwhitecols_curline(); |
| 7 | 2622 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
|
2623 |
| 7 | 2624 if (oap->op_type == OP_APPEND) |
| 2625 firstline += bd.textlen; | |
| 2626 pre_textlen = (long)STRLEN(firstline); | |
| 2627 } | |
| 2628 | |
| 2629 if (oap->op_type == OP_APPEND) | |
| 2630 { | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2631 if (oap->block_mode && curwin->w_cursor.coladd == 0) |
| 7 | 2632 { |
| 2633 /* Move the cursor to the character right of the block. */ | |
| 2634 curwin->w_set_curswant = TRUE; | |
| 2635 while (*ml_get_cursor() != NUL | |
| 2636 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
| 2637 ++curwin->w_cursor.col; | |
| 2638 if (bd.is_short && !bd.is_MAX) | |
| 2639 { | |
| 2640 /* First line was too short, make it longer and adjust the | |
| 2641 * values in "bd". */ | |
| 2642 if (u_save_cursor() == FAIL) | |
| 2643 return; | |
| 2644 for (i = 0; i < bd.endspaces; ++i) | |
| 2645 ins_char(' '); | |
| 2646 bd.textlen += bd.endspaces; | |
| 2647 } | |
| 2648 } | |
| 2649 else | |
| 2650 { | |
| 2651 curwin->w_cursor = oap->end; | |
| 893 | 2652 check_cursor_col(); |
| 7 | 2653 |
| 2654 /* 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
|
2655 if (!LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2656 && oap->start_vcol != oap->end_vcol) |
| 2657 inc_cursor(); | |
| 2658 } | |
| 2659 } | |
| 2660 | |
| 6579 | 2661 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
|
2662 (void)edit(NUL, FALSE, (linenr_T)count1); |
| 7 | 2663 |
| 6579 | 2664 /* When a tab was inserted, and the characters in front of the tab |
| 2665 * have been converted to a tab as well, the column of the cursor | |
| 2666 * might have actually been reduced, so need to adjust here. */ | |
| 2667 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
|
2668 && LT_POS(curbuf->b_op_start_orig, t1)) |
| 6579 | 2669 oap->start = curbuf->b_op_start_orig; |
| 2670 | |
| 1477 | 2671 /* If user has moved off this line, we don't know what to do, so do |
| 2672 * nothing. | |
| 2673 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 2674 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 7 | 2675 return; |
| 2676 | |
| 2677 if (oap->block_mode) | |
| 2678 { | |
| 2679 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
|
2680 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
|
2681 size_t len; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2682 int add; |
| 7 | 2683 |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2684 /* 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
|
2685 * 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
|
2686 ind_post = (colnr_T)getwhitecols_curline(); |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2687 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
|
2688 { |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2689 bd.textcol += ind_post - ind_pre; |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2690 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
|
2691 did_indent = TRUE; |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2692 } |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2693 |
| 5471 | 2694 /* 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
|
2695 * 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
|
2696 * 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
|
2697 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
|
2698 && !bd.is_MAX && !did_indent) |
| 5471 | 2699 { |
| 2700 if (oap->op_type == OP_INSERT | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2701 && oap->start.col + oap->start.coladd |
| 5730 | 2702 != curbuf->b_op_start_orig.col |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2703 + curbuf->b_op_start_orig.coladd) |
| 5471 | 2704 { |
| 6579 | 2705 int t = getviscol2(curbuf->b_op_start_orig.col, |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2706 curbuf->b_op_start_orig.coladd); |
| 5680 | 2707 oap->start.col = curbuf->b_op_start_orig.col; |
| 6579 | 2708 pre_textlen -= t - oap->start_vcol; |
| 2709 oap->start_vcol = t; | |
| 5471 | 2710 } |
| 2711 else if (oap->op_type == OP_APPEND | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2712 && oap->end.col + oap->end.coladd |
| 5730 | 2713 >= curbuf->b_op_start_orig.col |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2714 + curbuf->b_op_start_orig.coladd) |
| 5471 | 2715 { |
| 6579 | 2716 int t = getviscol2(curbuf->b_op_start_orig.col, |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2717 curbuf->b_op_start_orig.coladd); |
| 5680 | 2718 oap->start.col = curbuf->b_op_start_orig.col; |
| 5471 | 2719 /* reset pre_textlen to the value of OP_INSERT */ |
| 2720 pre_textlen += bd.textlen; | |
| 6579 | 2721 pre_textlen -= t - oap->start_vcol; |
| 2722 oap->start_vcol = t; | |
| 5471 | 2723 oap->op_type = OP_INSERT; |
| 2724 } | |
| 2725 } | |
| 2726 | |
| 7 | 2727 /* |
| 2728 * Spaces and tabs in the indent may have changed to other spaces and | |
| 1392 | 2729 * tabs. Get the starting column again and correct the length. |
| 7 | 2730 * Don't do this when "$" used, end-of-line will have changed. |
| 2731 */ | |
| 2732 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
| 2733 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
| 2734 { | |
| 2735 if (oap->op_type == OP_APPEND) | |
| 2736 { | |
| 2737 pre_textlen += bd2.textlen - bd.textlen; | |
| 2738 if (bd2.endspaces) | |
| 2739 --bd2.textlen; | |
| 2740 } | |
| 2741 bd.textcol = bd2.textcol; | |
| 2742 bd.textlen = bd2.textlen; | |
| 2743 } | |
| 2744 | |
| 2745 /* | |
| 2746 * Subsequent calls to ml_get() flush the firstline data - take a | |
| 2747 * copy of the required string. | |
| 2748 */ | |
|
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2749 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
|
2750 len = STRLEN(firstline); |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2751 add = bd.textcol; |
| 7 | 2752 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
|
2753 add += bd.textlen; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2754 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
|
2755 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
|
2756 else |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2757 firstline += add; |
| 3421 | 2758 if (pre_textlen >= 0 |
| 2759 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
| 7 | 2760 { |
| 2761 ins_text = vim_strnsave(firstline, (int)ins_len); | |
| 2762 if (ins_text != NULL) | |
| 2763 { | |
| 2764 /* block handled here */ | |
| 2765 if (u_save(oap->start.lnum, | |
| 2766 (linenr_T)(oap->end.lnum + 1)) == OK) | |
| 2767 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
| 2768 &bd); | |
| 2769 | |
| 2770 curwin->w_cursor.col = oap->start.col; | |
| 2771 check_cursor(); | |
| 2772 vim_free(ins_text); | |
| 2773 } | |
| 2774 } | |
| 2775 } | |
| 2776 } | |
| 2777 | |
| 2778 /* | |
| 2779 * op_change - handle a change operation | |
| 2780 * | |
| 2781 * return TRUE if edit() returns because of a CTRL-O command | |
| 2782 */ | |
| 2783 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2784 op_change(oparg_T *oap) |
| 7 | 2785 { |
| 2786 colnr_T l; | |
| 2787 int retval; | |
| 2788 long offset; | |
| 2789 linenr_T linenr; | |
| 1392 | 2790 long ins_len; |
| 2791 long pre_textlen = 0; | |
| 2792 long pre_indent = 0; | |
| 7 | 2793 char_u *firstline; |
| 2794 char_u *ins_text, *newp, *oldp; | |
| 2795 struct block_def bd; | |
| 2796 | |
| 2797 l = oap->start.col; | |
| 2798 if (oap->motion_type == MLINE) | |
| 2799 { | |
| 2800 l = 0; | |
| 2801 #ifdef FEAT_SMARTINDENT | |
| 2802 if (!p_paste && curbuf->b_p_si | |
| 2803 # ifdef FEAT_CINDENT | |
| 2804 && !curbuf->b_p_cin | |
| 2805 # endif | |
| 2806 ) | |
| 2807 can_si = TRUE; /* It's like opening a new line, do si */ | |
| 2808 #endif | |
| 2809 } | |
| 2810 | |
| 2811 /* First delete the text in the region. In an empty buffer only need to | |
| 2812 * save for undo */ | |
| 2813 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 2814 { | |
| 2815 if (u_save_cursor() == FAIL) | |
| 2816 return FALSE; | |
| 2817 } | |
| 2818 else if (op_delete(oap) == FAIL) | |
| 2819 return FALSE; | |
| 2820 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2821 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2822 && !virtual_op) |
| 2823 inc_cursor(); | |
| 2824 | |
| 2825 /* check for still on same line (<CR> in inserted text meaningless) */ | |
| 2826 /* skip blank lines too */ | |
| 2827 if (oap->block_mode) | |
| 2828 { | |
| 2829 /* Add spaces before getting the current line length. */ | |
| 2830 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
| 2831 || gchar_cursor() == NUL)) | |
| 2832 coladvance_force(getviscol()); | |
| 1392 | 2833 firstline = ml_get(oap->start.lnum); |
| 2834 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
|
2835 pre_indent = (long)getwhitecols(firstline); |
| 7 | 2836 bd.textcol = curwin->w_cursor.col; |
| 2837 } | |
| 2838 | |
| 2839 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
| 2840 if (oap->motion_type == MLINE) | |
| 2841 fix_indent(); | |
| 2842 #endif | |
| 2843 | |
| 2844 retval = edit(NUL, FALSE, (linenr_T)1); | |
| 2845 | |
| 2846 /* | |
| 39 | 2847 * In Visual block mode, handle copying the new text to all lines of the |
| 7 | 2848 * block. |
| 1477 | 2849 * Don't repeat the insert when Insert mode ended with CTRL-C. |
| 7 | 2850 */ |
| 1477 | 2851 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
| 7 | 2852 { |
| 1392 | 2853 /* Auto-indenting may have changed the indent. If the cursor was past |
| 2854 * the indent, exclude that indent change from the inserted text. */ | |
| 7 | 2855 firstline = ml_get(oap->start.lnum); |
| 1403 | 2856 if (bd.textcol > (colnr_T)pre_indent) |
| 7 | 2857 { |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2858 long new_indent = (long)getwhitecols(firstline); |
| 1392 | 2859 |
| 2860 pre_textlen += new_indent - pre_indent; | |
| 2861 bd.textcol += new_indent - pre_indent; | |
| 2862 } | |
| 2863 | |
| 2864 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
| 2865 if (ins_len > 0) | |
| 2866 { | |
| 2867 /* Subsequent calls to ml_get() flush the firstline data - take a | |
| 2868 * copy of the inserted text. */ | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2869 if ((ins_text = alloc(ins_len + 1)) != NULL) |
| 7 | 2870 { |
| 419 | 2871 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
| 7 | 2872 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
| 2873 linenr++) | |
| 2874 { | |
| 2875 block_prep(oap, &bd, linenr, TRUE); | |
| 2876 if (!bd.is_short || virtual_op) | |
| 2877 { | |
| 2878 pos_T vpos; | |
| 2879 | |
| 2880 /* If the block starts in virtual space, count the | |
| 2881 * initial coladd offset as part of "startspaces" */ | |
| 2882 if (bd.is_short) | |
| 2883 { | |
| 1982 | 2884 vpos.lnum = linenr; |
| 7 | 2885 (void)getvpos(&vpos, oap->start_vcol); |
| 2886 } | |
| 2887 else | |
| 2888 vpos.coladd = 0; | |
| 2889 oldp = ml_get(linenr); | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2890 newp = alloc(STRLEN(oldp) + vpos.coladd + ins_len + 1); |
| 7 | 2891 if (newp == NULL) |
| 2892 continue; | |
| 2893 /* copy up to block start */ | |
| 2894 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2895 offset = bd.textcol; | |
| 6929 | 2896 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
| 7 | 2897 offset += vpos.coladd; |
| 2898 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
| 2899 offset += ins_len; | |
| 2900 oldp += bd.textcol; | |
| 1622 | 2901 STRMOVE(newp + offset, oldp); |
| 7 | 2902 ml_replace(linenr, newp, FALSE); |
| 2903 } | |
| 2904 } | |
| 2905 check_cursor(); | |
| 2906 | |
| 2907 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 2908 } | |
| 2909 vim_free(ins_text); | |
| 2910 } | |
| 2911 } | |
| 2912 | |
| 2913 return retval; | |
| 2914 } | |
| 2915 | |
| 2916 /* | |
| 2917 * set all the yank registers to empty (called from main()) | |
| 2918 */ | |
| 2919 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2920 init_yank(void) |
| 7 | 2921 { |
| 2922 int i; | |
| 2923 | |
| 2924 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2925 y_regs[i].y_array = NULL; | |
| 2926 } | |
| 2927 | |
| 356 | 2928 #if defined(EXITFREE) || defined(PROTO) |
| 2929 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2930 clear_registers(void) |
| 356 | 2931 { |
| 2932 int i; | |
| 2933 | |
| 2934 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2935 { | |
| 2936 y_current = &y_regs[i]; | |
| 2937 if (y_current->y_array != NULL) | |
| 2938 free_yank_all(); | |
| 2939 } | |
| 2940 } | |
| 2941 #endif | |
| 2942 | |
| 7 | 2943 /* |
| 2944 * Free "n" lines from the current yank register. | |
| 2945 * Called for normal freeing and in case of error. | |
| 2946 */ | |
| 2947 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2948 free_yank(long n) |
| 7 | 2949 { |
| 2950 if (y_current->y_array != NULL) | |
| 2951 { | |
| 2952 long i; | |
| 2953 | |
| 2954 for (i = n; --i >= 0; ) | |
| 2955 { | |
| 2956 #ifdef AMIGA /* only for very slow machines */ | |
| 2957 if ((i & 1023) == 1023) /* this may take a while */ | |
| 2958 { | |
| 2959 /* | |
| 2960 * This message should never cause a hit-return message. | |
| 2961 * Overwrite this message with any next message. | |
| 2962 */ | |
| 2963 ++no_wait_return; | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2964 smsg(_("freeing %ld lines"), i + 1); |
| 7 | 2965 --no_wait_return; |
| 2966 msg_didout = FALSE; | |
| 2967 msg_col = 0; | |
| 2968 } | |
| 2969 #endif | |
| 2970 vim_free(y_current->y_array[i]); | |
| 2971 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
2972 VIM_CLEAR(y_current->y_array); |
| 7 | 2973 #ifdef AMIGA |
| 2974 if (n >= 1000) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
2975 msg(""); |
| 7 | 2976 #endif |
| 2977 } | |
| 2978 } | |
| 2979 | |
| 2980 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 free_yank_all(void) |
| 7 | 2982 { |
| 2983 free_yank(y_current->y_size); | |
| 2984 } | |
| 2985 | |
| 2986 /* | |
| 2987 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
| 2988 * If we are to append (uppercase register), we first yank into a new yank | |
| 2989 * register and then concatenate the old and the new one (so we keep the old | |
| 2990 * one in case of out-of-memory). | |
| 2991 * | |
|
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2992 * Return FAIL for failure, OK otherwise. |
| 7 | 2993 */ |
| 2994 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2995 op_yank(oparg_T *oap, int deleting, int mess) |
| 7 | 2996 { |
| 2997 long y_idx; /* index in y_array[] */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2998 yankreg_T *curr; /* copy of y_current */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2999 yankreg_T newreg; /* new yank register when appending */ |
| 7 | 3000 char_u **new_ptr; |
| 3001 linenr_T lnum; /* current line number */ | |
| 3002 long j; | |
| 3003 int yanktype = oap->motion_type; | |
| 3004 long yanklines = oap->line_count; | |
| 3005 linenr_T yankendlnum = oap->end.lnum; | |
| 3006 char_u *p; | |
| 3007 char_u *pnew; | |
| 3008 struct block_def bd; | |
| 2658 | 3009 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 2654 | 3010 int did_star = FALSE; |
| 2658 | 3011 #endif |
| 7 | 3012 |
| 3013 /* check for read-only register */ | |
| 3014 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
| 3015 { | |
| 3016 beep_flush(); | |
| 3017 return FAIL; | |
| 3018 } | |
| 3019 if (oap->regname == '_') /* black hole: nothing to do */ | |
| 3020 return OK; | |
| 3021 | |
| 3022 #ifdef FEAT_CLIPBOARD | |
| 3023 if (!clip_star.available && oap->regname == '*') | |
| 3024 oap->regname = 0; | |
| 3025 else if (!clip_plus.available && oap->regname == '+') | |
| 3026 oap->regname = 0; | |
| 3027 #endif | |
| 3028 | |
| 3029 if (!deleting) /* op_delete() already set y_current */ | |
| 3030 get_yank_register(oap->regname, TRUE); | |
| 3031 | |
| 3032 curr = y_current; | |
| 3033 /* append to existing contents */ | |
| 3034 if (y_append && y_current->y_array != NULL) | |
| 3035 y_current = &newreg; | |
| 3036 else | |
| 3037 free_yank_all(); /* free previously yanked lines */ | |
| 3038 | |
| 593 | 3039 /* |
| 3040 * If the cursor was in column 1 before and after the movement, and the | |
| 3041 * operator is not inclusive, the yank is always linewise. | |
| 3042 */ | |
| 7 | 3043 if ( oap->motion_type == MCHAR |
| 3044 && oap->start.col == 0 | |
| 3045 && !oap->inclusive | |
| 3046 && (!oap->is_VIsual || *p_sel == 'o') | |
| 50 | 3047 && !oap->block_mode |
| 7 | 3048 && oap->end.col == 0 |
| 3049 && yanklines > 1) | |
| 3050 { | |
| 3051 yanktype = MLINE; | |
| 3052 --yankendlnum; | |
| 3053 --yanklines; | |
| 3054 } | |
| 3055 | |
| 3056 y_current->y_size = yanklines; | |
| 3057 y_current->y_type = yanktype; /* set the yank register type */ | |
| 3058 y_current->y_width = 0; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3059 y_current->y_array = lalloc_clear(sizeof(char_u *) * yanklines, TRUE); |
| 7 | 3060 if (y_current->y_array == NULL) |
| 3061 { | |
| 3062 y_current = curr; | |
| 3063 return FAIL; | |
| 3064 } | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3065 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3066 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
|
3067 #endif |
| 7 | 3068 |
| 3069 y_idx = 0; | |
| 3070 lnum = oap->start.lnum; | |
| 3071 | |
| 3072 if (oap->block_mode) | |
| 3073 { | |
| 3074 /* Visual block mode */ | |
| 3075 y_current->y_type = MBLOCK; /* set the yank register type */ | |
| 3076 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
| 3077 | |
| 3078 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
| 3079 y_current->y_width--; | |
| 3080 } | |
| 3081 | |
| 3082 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
| 3083 { | |
| 3084 switch (y_current->y_type) | |
| 3085 { | |
| 3086 case MBLOCK: | |
| 3087 block_prep(oap, &bd, lnum, FALSE); | |
| 3088 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3089 goto fail; | |
| 3090 break; | |
| 3091 | |
| 3092 case MLINE: | |
| 3093 if ((y_current->y_array[y_idx] = | |
| 3094 vim_strsave(ml_get(lnum))) == NULL) | |
| 3095 goto fail; | |
| 3096 break; | |
| 3097 | |
| 3098 case MCHAR: | |
| 3099 { | |
| 3100 colnr_T startcol = 0, endcol = MAXCOL; | |
| 3101 int is_oneChar = FALSE; | |
| 3102 colnr_T cs, ce; | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3103 |
| 7 | 3104 p = ml_get(lnum); |
| 3105 bd.startspaces = 0; | |
| 3106 bd.endspaces = 0; | |
| 3107 | |
| 3108 if (lnum == oap->start.lnum) | |
| 3109 { | |
| 3110 startcol = oap->start.col; | |
| 3111 if (virtual_op) | |
| 3112 { | |
| 3113 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
| 3114 if (ce != cs && oap->start.coladd > 0) | |
| 3115 { | |
| 3116 /* Part of a tab selected -- but don't | |
| 3117 * double-count it. */ | |
| 3118 bd.startspaces = (ce - cs + 1) | |
| 3119 - oap->start.coladd; | |
| 3120 startcol++; | |
| 3121 } | |
| 3122 } | |
| 3123 } | |
| 3124 | |
| 3125 if (lnum == oap->end.lnum) | |
| 3126 { | |
| 3127 endcol = oap->end.col; | |
| 3128 if (virtual_op) | |
| 3129 { | |
| 3130 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
| 3131 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
| 3132 /* Don't add space for double-wide | |
| 3133 * char; endcol will be on last byte | |
| 3134 * of multi-byte char. */ | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3135 && (*mb_head_off)(p, p + endcol) == 0)) |
| 7 | 3136 { |
| 3137 if (oap->start.lnum == oap->end.lnum | |
| 3138 && oap->start.col == oap->end.col) | |
| 3139 { | |
| 3140 /* Special case: inside a single char */ | |
| 3141 is_oneChar = TRUE; | |
| 3142 bd.startspaces = oap->end.coladd | |
| 3143 - oap->start.coladd + oap->inclusive; | |
| 3144 endcol = startcol; | |
| 3145 } | |
| 3146 else | |
| 3147 { | |
| 3148 bd.endspaces = oap->end.coladd | |
| 3149 + oap->inclusive; | |
| 3150 endcol -= oap->inclusive; | |
| 3151 } | |
| 3152 } | |
| 3153 } | |
| 3154 } | |
| 3510 | 3155 if (endcol == MAXCOL) |
| 3156 endcol = (colnr_T)STRLEN(p); | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3157 if (startcol > endcol || is_oneChar) |
| 7 | 3158 bd.textlen = 0; |
| 3159 else | |
| 3160 bd.textlen = endcol - startcol + oap->inclusive; | |
| 3161 bd.textstart = p + startcol; | |
| 3162 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3163 goto fail; | |
| 3164 break; | |
| 3165 } | |
| 3166 /* NOTREACHED */ | |
| 3167 } | |
| 3168 } | |
| 3169 | |
| 3170 if (curr != y_current) /* append the new block to the old block */ | |
| 3171 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3172 new_ptr = ALLOC_MULT(char_u *, curr->y_size + y_current->y_size); |
| 7 | 3173 if (new_ptr == NULL) |
| 3174 goto fail; | |
| 3175 for (j = 0; j < curr->y_size; ++j) | |
| 3176 new_ptr[j] = curr->y_array[j]; | |
| 3177 vim_free(curr->y_array); | |
| 3178 curr->y_array = new_ptr; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3179 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3180 curr->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3181 #endif |
| 7 | 3182 |
| 3183 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
| 3184 curr->y_type = MLINE; | |
| 3185 | |
| 164 | 3186 /* Concatenate the last line of the old block with the first line of |
| 3187 * the new block, unless being Vi compatible. */ | |
| 3188 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
| 7 | 3189 { |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
3190 pnew = alloc(STRLEN(curr->y_array[curr->y_size - 1]) |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
3191 + STRLEN(y_current->y_array[0]) + 1); |
| 7 | 3192 if (pnew == NULL) |
| 3193 { | |
| 3194 y_idx = y_current->y_size - 1; | |
| 3195 goto fail; | |
| 3196 } | |
| 3197 STRCPY(pnew, curr->y_array[--j]); | |
| 3198 STRCAT(pnew, y_current->y_array[0]); | |
| 3199 vim_free(curr->y_array[j]); | |
| 3200 vim_free(y_current->y_array[0]); | |
| 3201 curr->y_array[j++] = pnew; | |
| 3202 y_idx = 1; | |
| 3203 } | |
| 3204 else | |
| 3205 y_idx = 0; | |
| 3206 while (y_idx < y_current->y_size) | |
| 3207 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
| 3208 curr->y_size = j; | |
| 3209 vim_free(y_current->y_array); | |
| 3210 y_current = curr; | |
| 3211 } | |
| 5981 | 3212 if (curwin->w_p_rnu) |
| 3213 redraw_later(SOME_VALID); /* cursor moved to start */ | |
| 7 | 3214 if (mess) /* Display message about yank? */ |
| 3215 { | |
| 3216 if (yanktype == MCHAR | |
| 3217 && !oap->block_mode | |
| 3218 && yanklines == 1) | |
| 3219 yanklines = 0; | |
| 3220 /* Some versions of Vi use ">=" here, some don't... */ | |
| 3221 if (yanklines > p_report) | |
| 3222 { | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3223 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
|
3224 |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3225 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
|
3226 *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
|
3227 else |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3228 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
|
3229 _(" 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
|
3230 |
| 7 | 3231 /* redisplay now, so message is not deleted */ |
| 3232 update_topline_redraw(); | |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3233 if (oap->block_mode) |
| 205 | 3234 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3235 smsg(NGETTEXT("block of %ld line yanked%s", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3236 "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
|
3237 yanklines, namebuf); |
| 205 | 3238 } |
| 7 | 3239 else |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3240 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3241 smsg(NGETTEXT("%ld line yanked%s", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3242 "%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
|
3243 yanklines, namebuf); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3244 } |
| 7 | 3245 } |
| 3246 } | |
| 3247 | |
| 3248 /* | |
| 3249 * Set "'[" and "']" marks. | |
| 3250 */ | |
| 3251 curbuf->b_op_start = oap->start; | |
| 3252 curbuf->b_op_end = oap->end; | |
| 5735 | 3253 if (yanktype == MLINE && !oap->block_mode) |
| 36 | 3254 { |
| 3255 curbuf->b_op_start.col = 0; | |
| 3256 curbuf->b_op_end.col = MAXCOL; | |
| 3257 } | |
| 7 | 3258 |
| 3259 #ifdef FEAT_CLIPBOARD | |
| 3260 /* | |
| 3261 * If we were yanking to the '*' register, send result to clipboard. | |
| 3262 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
| 3263 * to the '*' register. | |
| 3264 */ | |
| 3265 if (clip_star.available | |
| 3266 && (curr == &(y_regs[STAR_REGISTER]) | |
| 2654 | 3267 || (!deleting && oap->regname == 0 |
| 6116 | 3268 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
| 7 | 3269 { |
| 3270 if (curr != &(y_regs[STAR_REGISTER])) | |
| 3271 /* Copy the text from register 0 to the clipboard register. */ | |
| 3272 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3273 | |
| 3274 clip_own_selection(&clip_star); | |
| 3275 clip_gen_set_selection(&clip_star); | |
| 2658 | 3276 # ifdef FEAT_X11 |
| 2654 | 3277 did_star = TRUE; |
| 2658 | 3278 # endif |
| 7 | 3279 } |
| 3280 | |
| 3281 # ifdef FEAT_X11 | |
| 3282 /* | |
| 3283 * If we were yanking to the '+' register, send result to selection. | |
| 3284 * Also copy to the '*' register, in case auto-select is off. | |
| 3285 */ | |
| 2654 | 3286 if (clip_plus.available |
| 3287 && (curr == &(y_regs[PLUS_REGISTER]) | |
| 3288 || (!deleting && oap->regname == 0 | |
| 6116 | 3289 && ((clip_unnamed | clip_unnamed_saved) & |
| 3290 CLIP_UNNAMED_PLUS)))) | |
| 7 | 3291 { |
| 2654 | 3292 if (curr != &(y_regs[PLUS_REGISTER])) |
| 3293 /* Copy the text from register 0 to the clipboard register. */ | |
| 3294 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 3295 | |
| 7 | 3296 clip_own_selection(&clip_plus); |
| 3297 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
|
3298 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
|
3299 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
| 7 | 3300 { |
| 3301 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3302 clip_own_selection(&clip_star); | |
| 3303 clip_gen_set_selection(&clip_star); | |
| 3304 } | |
| 3305 } | |
| 3306 # endif | |
| 3307 #endif | |
| 3308 | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3309 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3310 if (!deleting && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3311 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
|
3312 #endif |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3313 |
| 7 | 3314 return OK; |
| 3315 | |
| 3316 fail: /* free the allocated lines */ | |
| 3317 free_yank(y_idx + 1); | |
| 3318 y_current = curr; | |
| 3319 return FAIL; | |
| 3320 } | |
| 3321 | |
| 3322 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3323 yank_copy_line(struct block_def *bd, long y_idx) |
| 7 | 3324 { |
| 3325 char_u *pnew; | |
| 3326 | |
| 3327 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
| 3328 == NULL) | |
| 3329 return FAIL; | |
| 3330 y_current->y_array[y_idx] = pnew; | |
| 6929 | 3331 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
| 7 | 3332 pnew += bd->startspaces; |
| 3333 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
| 3334 pnew += bd->textlen; | |
| 6929 | 3335 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
| 7 | 3336 pnew += bd->endspaces; |
| 3337 *pnew = NUL; | |
| 3338 return OK; | |
| 3339 } | |
| 3340 | |
| 3341 #ifdef FEAT_CLIPBOARD | |
| 3342 /* | |
| 3343 * Make a copy of the y_current register to register "reg". | |
| 3344 */ | |
| 3345 static void | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3346 copy_yank_reg(yankreg_T *reg) |
| 7 | 3347 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3348 yankreg_T *curr = y_current; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3349 long j; |
| 7 | 3350 |
| 3351 y_current = reg; | |
| 3352 free_yank_all(); | |
| 3353 *y_current = *curr; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3354 y_current->y_array = lalloc_clear( |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3355 sizeof(char_u *) * y_current->y_size, TRUE); |
| 7 | 3356 if (y_current->y_array == NULL) |
| 3357 y_current->y_size = 0; | |
| 3358 else | |
| 3359 for (j = 0; j < y_current->y_size; ++j) | |
| 3360 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
| 3361 { | |
| 3362 free_yank(j); | |
| 3363 y_current->y_size = 0; | |
| 3364 break; | |
| 3365 } | |
| 3366 y_current = curr; | |
| 3367 } | |
| 3368 #endif | |
| 3369 | |
| 3370 /* | |
| 140 | 3371 * Put contents of register "regname" into the text. |
| 3372 * Caller must check "regname" to be valid! | |
| 3373 * "flags": PUT_FIXINDENT make indent look nice | |
| 3374 * PUT_CURSEND leave cursor after end of new text | |
| 3375 * PUT_LINE force linewise put (":put") | |
| 7 | 3376 */ |
| 3377 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3378 do_put( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3379 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3380 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
|
3381 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3382 int flags) |
| 7 | 3383 { |
| 3384 char_u *ptr; | |
| 3385 char_u *newp, *oldp; | |
| 3386 int yanklen; | |
| 3387 int totlen = 0; /* init for gcc */ | |
| 3388 linenr_T lnum; | |
| 3389 colnr_T col; | |
| 3390 long i; /* index in y_array[] */ | |
| 3391 int y_type; | |
| 3392 long y_size; | |
| 3393 int oldlen; | |
| 3394 long y_width = 0; | |
| 3395 colnr_T vcol; | |
| 3396 int delcount; | |
| 3397 int incr = 0; | |
| 3398 long j; | |
| 3399 struct block_def bd; | |
| 3400 char_u **y_array = NULL; | |
| 3401 long nr_lines = 0; | |
| 3402 pos_T new_cursor; | |
| 3403 int indent; | |
| 3404 int orig_indent = 0; /* init for gcc */ | |
| 3405 int indent_diff = 0; /* init for gcc */ | |
| 3406 int first_indent = TRUE; | |
| 3407 int lendiff = 0; | |
| 3408 pos_T old_pos; | |
| 3409 char_u *insert_string = NULL; | |
| 3410 int allocated = FALSE; | |
| 3411 long cnt; | |
| 3412 | |
| 3413 #ifdef FEAT_CLIPBOARD | |
| 3414 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
| 3415 adjust_clip_reg(®name); | |
| 3416 (void)may_get_selection(regname); | |
| 3417 #endif | |
| 3418 | |
| 3419 if (flags & PUT_FIXINDENT) | |
| 3420 orig_indent = get_indent(); | |
| 3421 | |
| 3422 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3423 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3424 | |
| 3425 /* | |
| 3426 * Using inserted text works differently, because the register includes | |
| 3427 * special characters (newlines, etc.). | |
| 3428 */ | |
| 3429 if (regname == '.') | |
| 3430 { | |
|
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3431 if (VIsual_active) |
|
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3432 stuffcharReadbuff(VIsual_mode); |
| 7 | 3433 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
| 3434 (count == -1 ? 'O' : 'i')), count, FALSE); | |
| 3435 /* Putting the text is done later, so can't really move the cursor to | |
| 3436 * the next character. Use "l" to simulate it. */ | |
| 3437 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
| 3438 stuffcharReadbuff('l'); | |
| 3439 return; | |
| 3440 } | |
| 3441 | |
| 3442 /* | |
| 3443 * For special registers '%' (file name), '#' (alternate file name) and | |
| 3444 * ':' (last command line), etc. we have to create a fake yank register. | |
| 3445 */ | |
| 3446 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
| 3447 { | |
| 3448 if (insert_string == NULL) | |
| 3449 return; | |
| 3450 } | |
| 3451 | |
|
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3452 /* 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
|
3453 * 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
|
3454 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
|
3455 goto end; |
| 4005 | 3456 |
| 7 | 3457 if (insert_string != NULL) |
| 3458 { | |
| 3459 y_type = MCHAR; | |
| 3460 #ifdef FEAT_EVAL | |
| 3461 if (regname == '=') | |
| 3462 { | |
| 3463 /* For the = register we need to split the string at NL | |
| 3093 | 3464 * characters. |
| 3465 * Loop twice: count the number of lines and save them. */ | |
| 7 | 3466 for (;;) |
| 3467 { | |
| 3468 y_size = 0; | |
| 3469 ptr = insert_string; | |
| 3470 while (ptr != NULL) | |
| 3471 { | |
| 3472 if (y_array != NULL) | |
| 3473 y_array[y_size] = ptr; | |
| 3474 ++y_size; | |
| 3475 ptr = vim_strchr(ptr, '\n'); | |
| 3476 if (ptr != NULL) | |
| 3477 { | |
| 3478 if (y_array != NULL) | |
| 3479 *ptr = NUL; | |
| 3480 ++ptr; | |
| 3093 | 3481 /* A trailing '\n' makes the register linewise. */ |
| 7 | 3482 if (*ptr == NUL) |
| 3483 { | |
| 3484 y_type = MLINE; | |
| 3485 break; | |
| 3486 } | |
| 3487 } | |
| 3488 } | |
| 3489 if (y_array != NULL) | |
| 3490 break; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3491 y_array = ALLOC_MULT(char_u *, y_size); |
| 7 | 3492 if (y_array == NULL) |
| 3493 goto end; | |
| 3494 } | |
| 3495 } | |
| 3496 else | |
| 3497 #endif | |
| 3498 { | |
| 3499 y_size = 1; /* use fake one-line yank register */ | |
| 3500 y_array = &insert_string; | |
| 3501 } | |
| 3502 } | |
| 3503 else | |
| 3504 { | |
| 3505 get_yank_register(regname, FALSE); | |
| 3506 | |
| 3507 y_type = y_current->y_type; | |
| 3508 y_width = y_current->y_width; | |
| 3509 y_size = y_current->y_size; | |
| 3510 y_array = y_current->y_array; | |
| 3511 } | |
| 3512 | |
| 3513 if (y_type == MLINE) | |
| 3514 { | |
| 3515 if (flags & PUT_LINE_SPLIT) | |
| 3516 { | |
| 6845 | 3517 char_u *p; |
| 3518 | |
| 7 | 3519 /* "p" or "P" in Visual mode: split the lines to put the text in |
| 3520 * between. */ | |
| 3521 if (u_save_cursor() == FAIL) | |
| 3522 goto end; | |
| 6845 | 3523 p = ml_get_cursor(); |
| 3524 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
|
3525 MB_PTR_ADV(p); |
| 6845 | 3526 ptr = vim_strsave(p); |
| 7 | 3527 if (ptr == NULL) |
| 3528 goto end; | |
| 3529 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
| 3530 vim_free(ptr); | |
| 3531 | |
| 6845 | 3532 oldp = ml_get_curline(); |
| 3533 p = oldp + curwin->w_cursor.col; | |
| 3534 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
|
3535 MB_PTR_ADV(p); |
| 6845 | 3536 ptr = vim_strnsave(oldp, p - oldp); |
| 7 | 3537 if (ptr == NULL) |
| 3538 goto end; | |
| 3539 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
| 3540 ++nr_lines; | |
| 3541 dir = FORWARD; | |
| 3542 } | |
| 3543 if (flags & PUT_LINE_FORWARD) | |
| 3544 { | |
| 3545 /* Must be "p" for a Visual block, put lines below the block. */ | |
| 692 | 3546 curwin->w_cursor = curbuf->b_visual.vi_end; |
| 7 | 3547 dir = FORWARD; |
| 3548 } | |
| 3549 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3550 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3551 } | |
| 3552 | |
| 3553 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
| 3554 y_type = MLINE; | |
| 3555 | |
| 3556 if (y_size == 0 || y_array == NULL) | |
| 3557 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3558 semsg(_("E353: Nothing in register %s"), |
| 7 | 3559 regname == 0 ? (char_u *)"\"" : transchar(regname)); |
| 3560 goto end; | |
| 3561 } | |
| 3562 | |
| 3563 if (y_type == MBLOCK) | |
| 3564 { | |
| 3565 lnum = curwin->w_cursor.lnum + y_size + 1; | |
| 3566 if (lnum > curbuf->b_ml.ml_line_count) | |
| 3567 lnum = curbuf->b_ml.ml_line_count + 1; | |
| 3568 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
| 3569 goto end; | |
| 3570 } | |
| 5735 | 3571 else if (y_type == MLINE) |
| 7 | 3572 { |
| 3573 lnum = curwin->w_cursor.lnum; | |
| 3574 #ifdef FEAT_FOLDING | |
| 3575 /* Correct line number for closed fold. Don't move the cursor yet, | |
| 3576 * u_save() uses it. */ | |
| 3577 if (dir == BACKWARD) | |
| 3578 (void)hasFolding(lnum, &lnum, NULL); | |
| 3579 else | |
| 3580 (void)hasFolding(lnum, NULL, &lnum); | |
| 3581 #endif | |
| 3582 if (dir == FORWARD) | |
| 3583 ++lnum; | |
|
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3584 /* 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
|
3585 * 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
|
3586 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
| 7 | 3587 goto end; |
| 3588 #ifdef FEAT_FOLDING | |
| 3589 if (dir == FORWARD) | |
| 3590 curwin->w_cursor.lnum = lnum - 1; | |
| 3591 else | |
| 3592 curwin->w_cursor.lnum = lnum; | |
| 3593 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
| 3594 #endif | |
| 3595 } | |
| 3596 else if (u_save_cursor() == FAIL) | |
| 3597 goto end; | |
| 3598 | |
| 3599 yanklen = (int)STRLEN(y_array[0]); | |
| 3600 | |
| 3601 if (ve_flags == VE_ALL && y_type == MCHAR) | |
| 3602 { | |
| 3603 if (gchar_cursor() == TAB) | |
| 3604 { | |
| 3605 /* Don't need to insert spaces when "p" on the last position of a | |
| 3606 * 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
|
3607 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3608 int viscol = getviscol(); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3609 if (dir == FORWARD |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3610 ? 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
|
3611 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
|
3612 : 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
|
3613 coladvance_force(viscol); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3614 #else |
| 7 | 3615 if (dir == FORWARD |
| 3616 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
| 3617 : curwin->w_cursor.coladd > 0) | |
| 3618 coladvance_force(getviscol()); | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3619 #endif |
| 7 | 3620 else |
| 3621 curwin->w_cursor.coladd = 0; | |
| 3622 } | |
| 3623 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
| 3624 coladvance_force(getviscol() + (dir == FORWARD)); | |
| 3625 } | |
| 3626 | |
| 3627 lnum = curwin->w_cursor.lnum; | |
| 3628 col = curwin->w_cursor.col; | |
| 3629 | |
| 3630 /* | |
| 3631 * Block mode | |
| 3632 */ | |
| 3633 if (y_type == MBLOCK) | |
| 3634 { | |
|
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3635 int c = gchar_cursor(); |
| 7 | 3636 colnr_T endcol2 = 0; |
| 3637 | |
| 3638 if (dir == FORWARD && c != NUL) | |
| 3639 { | |
| 3640 if (ve_flags == VE_ALL) | |
| 3641 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3642 else | |
| 3643 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
| 3644 | |
| 3645 if (has_mbyte) | |
| 3646 /* move to start of next multi-byte character */ | |
| 474 | 3647 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3648 else |
| 3649 if (c != TAB || ve_flags != VE_ALL) | |
| 3650 ++curwin->w_cursor.col; | |
| 3651 ++col; | |
| 3652 } | |
| 3653 else | |
| 3654 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3655 | |
| 3656 col += curwin->w_cursor.coladd; | |
| 1304 | 3657 if (ve_flags == VE_ALL |
| 3658 && (curwin->w_cursor.coladd > 0 | |
| 3659 || endcol2 == curwin->w_cursor.col)) | |
| 7 | 3660 { |
| 3661 if (dir == FORWARD && c == NUL) | |
| 3662 ++col; | |
| 3663 if (dir != FORWARD && c != NUL) | |
| 3664 ++curwin->w_cursor.col; | |
| 3665 if (c == TAB) | |
| 3666 { | |
| 3667 if (dir == BACKWARD && curwin->w_cursor.col) | |
| 3668 curwin->w_cursor.col--; | |
| 3669 if (dir == FORWARD && col - 1 == endcol2) | |
| 3670 curwin->w_cursor.col++; | |
| 3671 } | |
| 3672 } | |
| 3673 curwin->w_cursor.coladd = 0; | |
| 699 | 3674 bd.textcol = 0; |
| 7 | 3675 for (i = 0; i < y_size; ++i) |
| 3676 { | |
| 3677 int spaces; | |
| 3678 char shortline; | |
| 3679 | |
| 3680 bd.startspaces = 0; | |
| 3681 bd.endspaces = 0; | |
| 3682 vcol = 0; | |
| 3683 delcount = 0; | |
| 3684 | |
| 3685 /* add a new line */ | |
| 3686 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
| 3687 { | |
| 3688 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
| 3689 (colnr_T)1, FALSE) == FAIL) | |
| 3690 break; | |
| 3691 ++nr_lines; | |
| 3692 } | |
| 3693 /* get the old line and advance to the position to insert at */ | |
| 3694 oldp = ml_get_curline(); | |
| 3695 oldlen = (int)STRLEN(oldp); | |
| 3696 for (ptr = oldp; vcol < col && *ptr; ) | |
| 3697 { | |
| 3698 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 3699 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
| 7 | 3700 vcol += incr; |
| 3701 } | |
| 3702 bd.textcol = (colnr_T)(ptr - oldp); | |
| 3703 | |
| 3704 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
| 3705 | |
| 3706 if (vcol < col) /* line too short, padd with spaces */ | |
| 3707 bd.startspaces = col - vcol; | |
| 3708 else if (vcol > col) | |
| 3709 { | |
| 3710 bd.endspaces = vcol - col; | |
| 3711 bd.startspaces = incr - bd.endspaces; | |
| 3712 --bd.textcol; | |
| 3713 delcount = 1; | |
| 3714 if (has_mbyte) | |
| 3715 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
| 3716 if (oldp[bd.textcol] != TAB) | |
| 3717 { | |
| 3718 /* Only a Tab can be split into spaces. Other | |
| 3719 * characters will have to be moved to after the | |
| 3720 * block, causing misalignment. */ | |
| 3721 delcount = 0; | |
| 3722 bd.endspaces = 0; | |
| 3723 } | |
| 3724 } | |
| 3725 | |
| 3726 yanklen = (int)STRLEN(y_array[i]); | |
| 3727 | |
| 3728 /* calculate number of spaces required to fill right side of block*/ | |
| 3729 spaces = y_width + 1; | |
| 3730 for (j = 0; j < yanklen; j++) | |
| 5995 | 3731 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
| 7 | 3732 if (spaces < 0) |
| 3733 spaces = 0; | |
| 3734 | |
| 3735 /* insert the new text */ | |
| 3736 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3737 newp = alloc(totlen + oldlen + 1); |
| 7 | 3738 if (newp == NULL) |
| 3739 break; | |
| 3740 /* copy part up to cursor to new line */ | |
| 3741 ptr = newp; | |
| 3742 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
| 3743 ptr += bd.textcol; | |
| 3744 /* may insert some spaces before the new text */ | |
| 6929 | 3745 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
| 7 | 3746 ptr += bd.startspaces; |
| 3747 /* insert the new text */ | |
| 3748 for (j = 0; j < count; ++j) | |
| 3749 { | |
| 3750 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
| 3751 ptr += yanklen; | |
| 3752 | |
| 3753 /* insert block's trailing spaces only if there's text behind */ | |
| 3754 if ((j < count - 1 || !shortline) && spaces) | |
| 3755 { | |
| 6929 | 3756 vim_memset(ptr, ' ', (size_t)spaces); |
| 7 | 3757 ptr += spaces; |
| 3758 } | |
| 3759 } | |
| 3760 /* may insert some spaces after the new text */ | |
| 6929 | 3761 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
| 7 | 3762 ptr += bd.endspaces; |
| 3763 /* move the text after the cursor to the end of the line. */ | |
| 3764 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
| 3765 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
| 3766 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 3767 | |
| 3768 ++curwin->w_cursor.lnum; | |
| 3769 if (i == 0) | |
| 3770 curwin->w_cursor.col += bd.startspaces; | |
| 3771 } | |
| 3772 | |
| 3773 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
| 3774 | |
| 3775 /* Set '[ mark. */ | |
| 3776 curbuf->b_op_start = curwin->w_cursor; | |
| 3777 curbuf->b_op_start.lnum = lnum; | |
| 3778 | |
| 3779 /* adjust '] mark */ | |
| 3780 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
| 3781 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
| 3782 curbuf->b_op_end.coladd = 0; | |
| 3783 if (flags & PUT_CURSEND) | |
| 3784 { | |
| 916 | 3785 colnr_T len; |
| 3786 | |
| 7 | 3787 curwin->w_cursor = curbuf->b_op_end; |
| 3788 curwin->w_cursor.col++; | |
| 916 | 3789 |
| 3790 /* in Insert mode we might be after the NUL, correct for that */ | |
| 3791 len = (colnr_T)STRLEN(ml_get_curline()); | |
| 3792 if (curwin->w_cursor.col > len) | |
| 3793 curwin->w_cursor.col = len; | |
| 7 | 3794 } |
| 3795 else | |
| 3796 curwin->w_cursor.lnum = lnum; | |
| 3797 } | |
| 3798 else | |
| 3799 { | |
| 3800 /* | |
| 3801 * Character or Line mode | |
| 3802 */ | |
| 3803 if (y_type == MCHAR) | |
| 3804 { | |
| 3805 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
| 3806 * char */ | |
| 3807 if (dir == FORWARD && gchar_cursor() != NUL) | |
| 3808 { | |
| 3809 if (has_mbyte) | |
| 3810 { | |
| 474 | 3811 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3812 |
| 3813 /* put it on the next of the multi-byte character. */ | |
| 3814 col += bytelen; | |
| 3815 if (yanklen) | |
| 3816 { | |
| 3817 curwin->w_cursor.col += bytelen; | |
| 3818 curbuf->b_op_end.col += bytelen; | |
| 3819 } | |
| 3820 } | |
| 3821 else | |
| 3822 { | |
| 3823 ++col; | |
| 3824 if (yanklen) | |
| 3825 { | |
| 3826 ++curwin->w_cursor.col; | |
| 3827 ++curbuf->b_op_end.col; | |
| 3828 } | |
| 3829 } | |
| 3830 } | |
| 3831 curbuf->b_op_start = curwin->w_cursor; | |
| 3832 } | |
| 3833 /* | |
| 3834 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
| 3835 */ | |
| 3836 else if (dir == BACKWARD) | |
| 3837 --lnum; | |
| 699 | 3838 new_cursor = curwin->w_cursor; |
| 7 | 3839 |
| 3840 /* | |
| 3841 * simple case: insert into current line | |
| 3842 */ | |
| 3843 if (y_type == MCHAR && y_size == 1) | |
| 3844 { | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3845 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
|
3846 |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3847 if (VIsual_active) |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3848 { |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3849 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
|
3850 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
|
3851 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
|
3852 } |
|
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3853 |
| 5365 | 3854 do { |
| 3855 totlen = count * yanklen; | |
| 3856 if (totlen > 0) | |
| 7 | 3857 { |
| 5365 | 3858 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
|
3859 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
|
3860 { |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3861 lnum++; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3862 continue; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3863 } |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3864 newp = alloc(STRLEN(oldp) + totlen + 1); |
| 5365 | 3865 if (newp == NULL) |
| 3866 goto end; /* alloc() gave an error message */ | |
| 3867 mch_memmove(newp, oldp, (size_t)col); | |
| 3868 ptr = newp + col; | |
| 3869 for (i = 0; i < count; ++i) | |
| 3870 { | |
| 3871 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
| 3872 ptr += yanklen; | |
| 3873 } | |
| 3874 STRMOVE(ptr, oldp + col); | |
| 3875 ml_replace(lnum, newp, FALSE); | |
| 3876 /* Place cursor on last putted char. */ | |
| 3877 if (lnum == curwin->w_cursor.lnum) | |
| 5496 | 3878 { |
| 3879 /* make sure curwin->w_virtcol is updated */ | |
| 3880 changed_cline_bef_curs(); | |
| 5365 | 3881 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
| 5496 | 3882 } |
| 7 | 3883 } |
| 5365 | 3884 if (VIsual_active) |
| 3885 lnum++; | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3886 } while (VIsual_active && lnum <= end_lnum); |
| 5365 | 3887 |
| 6379 | 3888 if (VIsual_active) /* reset lnum to the last visual line */ |
| 3889 lnum--; | |
| 3890 | |
| 7 | 3891 curbuf->b_op_end = curwin->w_cursor; |
| 3892 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
| 3893 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
| 3894 ++curwin->w_cursor.col; | |
| 3895 changed_bytes(lnum, col); | |
| 3896 } | |
| 3897 else | |
| 3898 { | |
| 3899 /* | |
| 3900 * Insert at least one line. When y_type is MCHAR, break the first | |
| 3901 * line in two. | |
| 3902 */ | |
| 3903 for (cnt = 1; cnt <= count; ++cnt) | |
| 3904 { | |
| 3905 i = 0; | |
| 3906 if (y_type == MCHAR) | |
| 3907 { | |
| 3908 /* | |
| 3909 * Split the current line in two at the insert position. | |
| 3910 * First insert y_array[size - 1] in front of second line. | |
| 3911 * Then append y_array[0] to first line. | |
| 3912 */ | |
| 3913 lnum = new_cursor.lnum; | |
| 3914 ptr = ml_get(lnum) + col; | |
| 3915 totlen = (int)STRLEN(y_array[y_size - 1]); | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3916 newp = alloc(STRLEN(ptr) + totlen + 1); |
| 7 | 3917 if (newp == NULL) |
| 3918 goto error; | |
| 3919 STRCPY(newp, y_array[y_size - 1]); | |
| 3920 STRCAT(newp, ptr); | |
| 3921 /* insert second line */ | |
| 3922 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
| 3923 vim_free(newp); | |
| 3924 | |
| 3925 oldp = ml_get(lnum); | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3926 newp = alloc(col + yanklen + 1); |
| 7 | 3927 if (newp == NULL) |
| 3928 goto error; | |
| 3929 /* copy first part of line */ | |
| 3930 mch_memmove(newp, oldp, (size_t)col); | |
| 3931 /* append to first line */ | |
| 3932 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
| 3933 ml_replace(lnum, newp, FALSE); | |
| 3934 | |
| 3935 curwin->w_cursor.lnum = lnum; | |
| 3936 i = 1; | |
| 3937 } | |
| 3938 | |
| 3939 for (; i < y_size; ++i) | |
| 3940 { | |
| 3941 if ((y_type != MCHAR || i < y_size - 1) | |
| 3942 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
| 3943 == FAIL) | |
| 3944 goto error; | |
| 3945 lnum++; | |
| 3946 ++nr_lines; | |
| 3947 if (flags & PUT_FIXINDENT) | |
| 3948 { | |
| 3949 old_pos = curwin->w_cursor; | |
| 3950 curwin->w_cursor.lnum = lnum; | |
| 3951 ptr = ml_get(lnum); | |
| 3952 if (cnt == count && i == y_size - 1) | |
| 3953 lendiff = (int)STRLEN(ptr); | |
| 3954 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 3955 if (*ptr == '#' && preprocs_left()) | |
| 3956 indent = 0; /* Leave # lines at start */ | |
| 3957 else | |
| 3958 #endif | |
| 3959 if (*ptr == NUL) | |
| 3960 indent = 0; /* Ignore empty lines */ | |
| 3961 else if (first_indent) | |
| 3962 { | |
| 3963 indent_diff = orig_indent - get_indent(); | |
| 3964 indent = orig_indent; | |
| 3965 first_indent = FALSE; | |
| 3966 } | |
| 3967 else if ((indent = get_indent() + indent_diff) < 0) | |
| 3968 indent = 0; | |
| 3969 (void)set_indent(indent, 0); | |
| 3970 curwin->w_cursor = old_pos; | |
| 3971 /* remember how many chars were removed */ | |
| 3972 if (cnt == count && i == y_size - 1) | |
| 3973 lendiff -= (int)STRLEN(ml_get(lnum)); | |
| 3974 } | |
| 3975 } | |
| 3976 } | |
| 3977 | |
| 3978 error: | |
| 3979 /* Adjust marks. */ | |
| 3980 if (y_type == MLINE) | |
| 3981 { | |
| 3982 curbuf->b_op_start.col = 0; | |
| 3983 if (dir == FORWARD) | |
| 3984 curbuf->b_op_start.lnum++; | |
| 3985 } | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3986 /* 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
|
3987 * 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
|
3988 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
|
3989 < 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
|
3990 #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
|
3991 || 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
|
3992 #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
|
3993 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3994 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
| 7 | 3995 (linenr_T)MAXLNUM, nr_lines, 0L); |
| 3996 | |
| 3997 /* note changed text for displaying and folding */ | |
| 3998 if (y_type == MCHAR) | |
| 3999 changed_lines(curwin->w_cursor.lnum, col, | |
| 4000 curwin->w_cursor.lnum + 1, nr_lines); | |
| 4001 else | |
| 4002 changed_lines(curbuf->b_op_start.lnum, 0, | |
| 4003 curbuf->b_op_start.lnum, nr_lines); | |
| 4004 | |
| 4005 /* put '] mark at last inserted character */ | |
| 4006 curbuf->b_op_end.lnum = lnum; | |
| 4007 /* correct length for change in indent */ | |
| 4008 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
| 4009 if (col > 1) | |
| 4010 curbuf->b_op_end.col = col - 1; | |
| 4011 else | |
| 4012 curbuf->b_op_end.col = 0; | |
| 4013 | |
| 168 | 4014 if (flags & PUT_CURSLINE) |
| 4015 { | |
| 237 | 4016 /* ":put": put cursor on last inserted line */ |
| 168 | 4017 curwin->w_cursor.lnum = lnum; |
| 4018 beginline(BL_WHITE | BL_FIX); | |
| 4019 } | |
| 4020 else if (flags & PUT_CURSEND) | |
| 7 | 4021 { |
| 4022 /* put cursor after inserted text */ | |
| 4023 if (y_type == MLINE) | |
| 4024 { | |
| 4025 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 4026 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 4027 else | |
| 4028 curwin->w_cursor.lnum = lnum + 1; | |
| 4029 curwin->w_cursor.col = 0; | |
| 4030 } | |
| 4031 else | |
| 4032 { | |
| 4033 curwin->w_cursor.lnum = lnum; | |
| 4034 curwin->w_cursor.col = col; | |
| 4035 } | |
| 4036 } | |
| 4037 else if (y_type == MLINE) | |
| 4038 { | |
| 168 | 4039 /* put cursor on first non-blank in first inserted line */ |
| 7 | 4040 curwin->w_cursor.col = 0; |
| 4041 if (dir == FORWARD) | |
| 4042 ++curwin->w_cursor.lnum; | |
| 4043 beginline(BL_WHITE | BL_FIX); | |
| 4044 } | |
| 4045 else /* put cursor on first inserted character */ | |
| 4046 curwin->w_cursor = new_cursor; | |
| 4047 } | |
| 4048 } | |
| 4049 | |
| 4050 msgmore(nr_lines); | |
| 4051 curwin->w_set_curswant = TRUE; | |
| 4052 | |
| 4053 end: | |
| 4054 if (allocated) | |
| 4055 vim_free(insert_string); | |
| 840 | 4056 if (regname == '=') |
| 4057 vim_free(y_array); | |
| 4058 | |
| 5380 | 4059 VIsual_active = FALSE; |
| 4060 | |
| 140 | 4061 /* If the cursor is past the end of the line put it at the end. */ |
| 844 | 4062 adjust_cursor_eol(); |
| 4063 } | |
| 4064 | |
| 4065 /* | |
| 4066 * When the cursor is on the NUL past the end of the line and it should not be | |
| 4067 * there move it left. | |
| 4068 */ | |
| 4069 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4070 adjust_cursor_eol(void) |
| 844 | 4071 { |
| 4072 if (curwin->w_cursor.col > 0 | |
| 4073 && gchar_cursor() == NUL | |
| 773 | 4074 && (ve_flags & VE_ONEMORE) == 0 |
| 7 | 4075 && !(restart_edit || (State & INSERT))) |
| 4076 { | |
| 557 | 4077 /* Put the cursor on the last character in the line. */ |
| 555 | 4078 dec_cursor(); |
| 844 | 4079 |
| 7 | 4080 if (ve_flags == VE_ALL) |
| 557 | 4081 { |
| 4082 colnr_T scol, ecol; | |
| 4083 | |
| 4084 /* Coladd is set to the width of the last character. */ | |
| 4085 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
| 4086 curwin->w_cursor.coladd = ecol - scol + 1; | |
| 4087 } | |
| 7 | 4088 } |
| 4089 } | |
| 4090 | |
| 4091 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 4092 /* | |
| 4093 * Return TRUE if lines starting with '#' should be left aligned. | |
| 4094 */ | |
| 4095 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4096 preprocs_left(void) |
| 7 | 4097 { |
| 4098 return | |
| 4099 # ifdef FEAT_SMARTINDENT | |
| 4100 # ifdef FEAT_CINDENT | |
| 4101 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
| 4102 # else | |
| 4103 curbuf->b_p_si | |
| 4104 # endif | |
| 4105 # endif | |
| 4106 # ifdef FEAT_CINDENT | |
| 5438 | 4107 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
| 4108 && curbuf->b_ind_hash_comment == 0) | |
| 7 | 4109 # endif |
| 4110 ; | |
| 4111 } | |
| 4112 #endif | |
| 4113 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4114 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4115 * 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
|
4116 */ |
| 7 | 4117 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4118 get_register_name(int num) |
| 7 | 4119 { |
| 4120 if (num == -1) | |
| 4121 return '"'; | |
| 4122 else if (num < 10) | |
| 4123 return num + '0'; | |
| 4124 else if (num == DELETION_REGISTER) | |
| 4125 return '-'; | |
| 4126 #ifdef FEAT_CLIPBOARD | |
| 4127 else if (num == STAR_REGISTER) | |
| 4128 return '*'; | |
| 4129 else if (num == PLUS_REGISTER) | |
| 4130 return '+'; | |
| 4131 #endif | |
| 4132 else | |
| 4133 { | |
| 4134 #ifdef EBCDIC | |
| 4135 int i; | |
| 4136 | |
| 4137 /* EBCDIC is really braindead ... */ | |
| 4138 i = 'a' + (num - 10); | |
| 4139 if (i > 'i') | |
| 4140 i += 7; | |
| 4141 if (i > 'r') | |
| 4142 i += 8; | |
| 4143 return i; | |
| 4144 #else | |
| 4145 return num + 'a' - 10; | |
| 4146 #endif | |
| 4147 } | |
| 4148 } | |
| 4149 | |
| 4150 /* | |
| 4151 * ":dis" and ":registers": Display the contents of the yank registers. | |
| 4152 */ | |
| 4153 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4154 ex_display(exarg_T *eap) |
| 7 | 4155 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4156 int i, n; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4157 long j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4158 char_u *p; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4159 yankreg_T *yb; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4160 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4161 int attr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4162 char_u *arg = eap->arg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4163 int clen; |
| 7 | 4164 |
| 4165 if (arg != NULL && *arg == NUL) | |
| 4166 arg = NULL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4167 attr = HL_ATTR(HLF_8); |
| 7 | 4168 |
| 4169 /* Highlight title */ | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4170 msg_puts_title(_("\n--- Registers ---")); |
| 7 | 4171 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) |
| 4172 { | |
| 4173 name = get_register_name(i); | |
| 2644 | 4174 if (arg != NULL && vim_strchr(arg, name) == NULL |
| 4175 #ifdef ONE_CLIPBOARD | |
| 4176 /* Star register and plus register contain the same thing. */ | |
| 4177 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
| 4178 #endif | |
| 4179 ) | |
| 7 | 4180 continue; /* did not ask for this register */ |
| 4181 | |
| 4182 #ifdef FEAT_CLIPBOARD | |
| 4183 /* Adjust register name for "unnamed" in 'clipboard'. | |
| 4184 * When it's a clipboard register, fill it with the current contents | |
| 4185 * of the clipboard. */ | |
| 4186 adjust_clip_reg(&name); | |
| 4187 (void)may_get_selection(name); | |
| 4188 #endif | |
| 4189 | |
| 4190 if (i == -1) | |
| 4191 { | |
| 4192 if (y_previous != NULL) | |
| 4193 yb = y_previous; | |
| 4194 else | |
| 4195 yb = &(y_regs[0]); | |
| 4196 } | |
| 4197 else | |
| 4198 yb = &(y_regs[i]); | |
| 2000 | 4199 |
| 4200 #ifdef FEAT_EVAL | |
| 4201 if (name == MB_TOLOWER(redir_reg) | |
| 4202 || (redir_reg == '"' && yb == y_previous)) | |
| 4203 continue; /* do not list register being written to, the | |
| 4204 * pointer can be freed */ | |
| 4205 #endif | |
| 4206 | |
| 7 | 4207 if (yb->y_array != NULL) |
| 4208 { | |
| 4209 msg_putchar('\n'); | |
| 4210 msg_putchar('"'); | |
| 4211 msg_putchar(name); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4212 msg_puts(" "); |
| 7 | 4213 |
| 4214 n = (int)Columns - 6; | |
| 4215 for (j = 0; j < yb->y_size && n > 1; ++j) | |
| 4216 { | |
| 4217 if (j) | |
| 4218 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4219 msg_puts_attr("^J", attr); |
| 7 | 4220 n -= 2; |
| 4221 } | |
| 4222 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
| 4223 { | |
| 474 | 4224 clen = (*mb_ptr2len)(p); |
| 22 | 4225 msg_outtrans_len(p, clen); |
| 4226 p += clen - 1; | |
| 7 | 4227 } |
| 4228 } | |
| 4229 if (n > 1 && yb->y_type == MLINE) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4230 msg_puts_attr("^J", attr); |
| 7 | 4231 out_flush(); /* show one line at a time */ |
| 4232 } | |
| 4233 ui_breakcheck(); | |
| 4234 } | |
| 4235 | |
| 4236 /* | |
| 4237 * display last inserted text | |
| 4238 */ | |
| 4239 if ((p = get_last_insert()) != NULL | |
| 4240 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
| 4241 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4242 msg_puts("\n\". "); |
| 7 | 4243 dis_msg(p, TRUE); |
| 4244 } | |
| 4245 | |
| 4246 /* | |
| 4247 * display last command line | |
| 4248 */ | |
| 4249 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
| 4250 && !got_int) | |
| 4251 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4252 msg_puts("\n\": "); |
| 7 | 4253 dis_msg(last_cmdline, FALSE); |
| 4254 } | |
| 4255 | |
| 4256 /* | |
| 4257 * display current file name | |
| 4258 */ | |
| 4259 if (curbuf->b_fname != NULL | |
| 4260 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4261 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4262 msg_puts("\n\"% "); |
| 7 | 4263 dis_msg(curbuf->b_fname, FALSE); |
| 4264 } | |
| 4265 | |
| 4266 /* | |
| 4267 * display alternate file name | |
| 4268 */ | |
| 4269 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4270 { | |
| 4271 char_u *fname; | |
| 4272 linenr_T dummy; | |
| 4273 | |
| 4274 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
| 4275 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4276 msg_puts("\n\"# "); |
| 7 | 4277 dis_msg(fname, FALSE); |
| 4278 } | |
| 4279 } | |
| 4280 | |
| 4281 /* | |
| 4282 * display last search pattern | |
| 4283 */ | |
| 4284 if (last_search_pat() != NULL | |
| 4285 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
| 4286 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4287 msg_puts("\n\"/ "); |
| 7 | 4288 dis_msg(last_search_pat(), FALSE); |
| 4289 } | |
| 4290 | |
| 4291 #ifdef FEAT_EVAL | |
| 4292 /* | |
| 4293 * display last used expression | |
| 4294 */ | |
| 4295 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
| 4296 && !got_int) | |
| 4297 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4298 msg_puts("\n\"= "); |
| 7 | 4299 dis_msg(expr_line, FALSE); |
| 4300 } | |
| 4301 #endif | |
| 4302 } | |
| 4303 | |
| 4304 /* | |
| 4305 * display a string for do_dis() | |
| 4306 * truncate at end of screen line | |
| 4307 */ | |
| 4308 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4309 dis_msg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4310 char_u *p, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4311 int skip_esc) /* if TRUE, ignore trailing ESC */ |
| 7 | 4312 { |
| 4313 int n; | |
| 4314 int l; | |
| 4315 | |
| 4316 n = (int)Columns - 6; | |
| 4317 while (*p != NUL | |
| 4318 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
| 4319 && (n -= ptr2cells(p)) >= 0) | |
| 4320 { | |
| 474 | 4321 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 4322 { |
| 4323 msg_outtrans_len(p, l); | |
| 4324 p += l; | |
| 4325 } | |
| 4326 else | |
| 4327 msg_outtrans_len(p++, 1); | |
| 4328 } | |
| 4329 ui_breakcheck(); | |
| 4330 } | |
| 4331 | |
| 3562 | 4332 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4333 /* | |
| 4334 * If "process" is TRUE and the line begins with a comment leader (possibly | |
| 4335 * after some white space), return a pointer to the text after it. Put a boolean | |
| 4336 * value indicating whether the line ends with an unclosed comment in | |
| 4337 * "is_comment". | |
| 4338 * line - line to be processed, | |
| 4339 * process - if FALSE, will only check whether the line ends with an unclosed | |
| 3584 | 4340 * comment, |
| 3562 | 4341 * include_space - whether to also skip space following the comment leader, |
| 4342 * is_comment - will indicate whether the current line ends with an unclosed | |
| 3584 | 4343 * comment. |
| 3562 | 4344 */ |
|
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4345 char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4346 skip_comment( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4347 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4348 int process, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4349 int include_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4350 int *is_comment) |
| 3562 | 4351 { |
| 4352 char_u *comment_flags = NULL; | |
| 4353 int lead_len; | |
| 4354 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
| 4355 | |
| 4356 *is_comment = FALSE; | |
| 4357 if (leader_offset != -1) | |
| 4358 { | |
| 4359 /* Let's check whether the line ends with an unclosed comment. | |
| 4360 * If the last comment leader has COM_END in flags, there's no comment. | |
| 4361 */ | |
| 4362 while (*comment_flags) | |
| 4363 { | |
| 4364 if (*comment_flags == COM_END | |
| 4365 || *comment_flags == ':') | |
| 4366 break; | |
| 4367 ++comment_flags; | |
| 4368 } | |
| 4369 if (*comment_flags != COM_END) | |
| 4370 *is_comment = TRUE; | |
| 4371 } | |
| 4372 | |
| 4373 if (process == FALSE) | |
| 4374 return line; | |
| 4375 | |
| 4376 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
| 4377 | |
| 4378 if (lead_len == 0) | |
| 4379 return line; | |
| 4380 | |
| 4381 /* Find: | |
| 4382 * - COM_END, | |
| 4383 * - colon, | |
| 4384 * whichever comes first. | |
| 4385 */ | |
| 4386 while (*comment_flags) | |
| 4387 { | |
| 3580 | 4388 if (*comment_flags == COM_END |
| 3562 | 4389 || *comment_flags == ':') |
| 4390 break; | |
| 4391 ++comment_flags; | |
| 4392 } | |
| 4393 | |
| 4394 /* If we found a colon, it means that we are not processing a line | |
| 3580 | 4395 * starting with a closing part of a three-part comment. That's good, |
| 4396 * because we don't want to remove those as this would be annoying. | |
| 3562 | 4397 */ |
| 4398 if (*comment_flags == ':' || *comment_flags == NUL) | |
| 4399 line += lead_len; | |
| 4400 | |
| 4401 return line; | |
| 4402 } | |
| 4403 #endif | |
| 4404 | |
| 7 | 4405 /* |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4406 * 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
|
4407 * When "save_undo" is TRUE save lines for undo first. |
| 5848 | 4408 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
| 4409 * leaders should not be removed. | |
| 4410 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
| 4411 * to set those marks. | |
| 7 | 4412 * |
| 1217 | 4413 * return FAIL for failure, OK otherwise |
| 7 | 4414 */ |
| 4415 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4416 do_join( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4417 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4418 int insert_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4419 int save_undo, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4420 int use_formatoptions UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4421 int setmark) |
| 7 | 4422 { |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4423 char_u *curr = NULL; |
| 2597 | 4424 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
|
4425 char_u *cend; |
| 7 | 4426 char_u *newp; |
| 2597 | 4427 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
|
4428 int endcurr1 = NUL; |
|
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4429 int endcurr2 = NUL; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4430 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
|
4431 int sumsize = 0; /* size of the long new line */ |
| 7 | 4432 linenr_T t; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4433 colnr_T col = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4434 int ret = OK; |
| 3562 | 4435 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 3574 | 4436 int *comments = NULL; |
| 3562 | 4437 int remove_comments = (use_formatoptions == TRUE) |
| 4438 && has_format_option(FO_REMOVE_COMS); | |
| 4439 int prev_was_comment; | |
| 4440 #endif | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4441 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4442 textprop_T **prop_lines = NULL; |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4443 int *prop_lengths = NULL; |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4444 #endif |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4445 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4446 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
|
4447 (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
|
4448 return FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4449 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4450 /* 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
|
4451 * 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
|
4452 * proper placement of each original line in the new one. */ |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
4453 spaces = lalloc_clear(count, TRUE); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4454 if (spaces == NULL) |
| 7 | 4455 return FAIL; |
| 3562 | 4456 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4457 if (remove_comments) | |
| 4458 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4459 comments = lalloc_clear(count * sizeof(int), TRUE); |
| 3562 | 4460 if (comments == NULL) |
| 4461 { | |
| 4462 vim_free(spaces); | |
| 4463 return FAIL; | |
| 4464 } | |
| 4465 } | |
| 4466 #endif | |
| 7 | 4467 |
| 4468 /* | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4469 * Don't move anything yet, just compute the final line length |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4470 * and setup the array of space strings lengths |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4471 * This loops forward over the joined lines. |
| 7 | 4472 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 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
|
4474 { |
| 2597 | 4475 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
| 5848 | 4476 if (t == 0 && setmark) |
| 5664 | 4477 { |
| 4478 /* Set the '[ mark. */ | |
| 4479 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
| 4480 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
| 4481 } | |
| 3562 | 4482 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4483 if (remove_comments) | |
| 4484 { | |
| 4485 /* We don't want to remove the comment leader if the | |
| 4486 * previous line is not a comment. */ | |
| 4487 if (t > 0 && prev_was_comment) | |
| 4488 { | |
| 4489 | |
| 4490 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
| 4491 &prev_was_comment); | |
| 3576 | 4492 comments[t] = (int)(new_curr - curr); |
| 3562 | 4493 curr = new_curr; |
| 4494 } | |
| 4495 else | |
| 4496 curr = skip_comment(curr, FALSE, insert_space, | |
| 4497 &prev_was_comment); | |
| 4498 } | |
| 4499 #endif | |
| 4500 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4501 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
|
4502 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4504 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
|
4505 && (!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
|
4506 || (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
|
4507 && (!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
|
4508 || 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
|
4509 ) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4511 /* 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
|
4512 if (endcurr1 == ' ') |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 endcurr1 = endcurr2; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4516 /* 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
|
4517 if ( p_js |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 && (endcurr1 == '.' |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 || (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
|
4520 && (endcurr1 == '?' || endcurr1 == '!')))) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 sumsize += currsize + spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 endcurr1 = endcurr2 = NUL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4527 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
|
4528 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4529 if (has_mbyte) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4531 cend = curr + currsize; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4532 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
|
4533 endcurr1 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 if (cend > curr) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4535 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4536 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
|
4537 endcurr2 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4538 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4541 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 endcurr1 = *(curr + currsize - 1); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 if (currsize > 1) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4544 endcurr2 = *(curr + currsize - 2); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4545 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 line_breakcheck(); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 if (got_int) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 ret = FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 goto theend; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4553 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4555 /* 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
|
4556 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
|
4557 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4558 /* allocate the space for the new line */ |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
4559 newp = alloc(sumsize + 1); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4560 cend = newp + sumsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 *cend = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4562 |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4563 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4564 // We need to move properties of the lines that are going to be deleted to |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4565 // the new long one. |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4566 if (curbuf->b_has_textprop && !text_prop_frozen) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4567 { |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4568 // Allocate an array to copy the text properties of joined lines into. |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4569 // And another array to store the number of properties in each line. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4570 prop_lines = ALLOC_CLEAR_MULT(textprop_T *, count - 1); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4571 prop_lengths = ALLOC_CLEAR_MULT(int, count - 1); |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4572 if (prop_lengths == NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4573 VIM_CLEAR(prop_lines); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4574 } |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4575 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4576 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4577 /* |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4578 * Move affected lines to the new long one. |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4579 * This loops backwards over the joined lines, including the original line. |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4580 * |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 * 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
|
4582 * 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
|
4583 * 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
|
4584 */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 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
|
4586 { |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4587 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
|
4588 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4589 cend -= currsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4590 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
|
4591 if (spaces[t] > 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4592 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4593 cend -= spaces[t]; |
| 6929 | 4594 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
|
4595 } |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4596 |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4597 // 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
|
4598 // 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
|
4599 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
|
4600 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4601 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
|
4602 (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
|
4603 if (t == 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 break; |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4605 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4606 if (prop_lines != NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4607 adjust_props_for_join(curwin->w_cursor.lnum + t, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4608 prop_lines + t - 1, prop_lengths + t - 1, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4609 (long)(cend - newp - spaces_removed), spaces_removed); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4610 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4611 |
| 2597 | 4612 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4613 #if defined(FEAT_COMMENTS) |
| 3562 | 4614 if (remove_comments) |
| 4615 curr += comments[t - 1]; | |
| 4616 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4617 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
|
4618 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4619 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4620 } |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4621 |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4622 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4623 if (prop_lines != NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4624 join_prop_lines(curwin->w_cursor.lnum, newp, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4625 prop_lines, prop_lengths, count); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4626 else |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4627 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4628 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
| 7 | 4629 |
| 5848 | 4630 if (setmark) |
| 4631 { | |
| 4632 /* Set the '] mark. */ | |
| 4633 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
|
16680
c263acbbd961
patch 8.1.1342: using freed memory when joining line with text property
Bram Moolenaar <Bram@vim.org>
parents:
16678
diff
changeset
|
4634 curwin->w_buffer->b_op_end.col = (colnr_T)sumsize; |
| 5848 | 4635 } |
| 5664 | 4636 |
| 7 | 4637 /* Only report the change in the first line here, del_lines() will report |
| 4638 * the deleted line. */ | |
| 4639 changed_lines(curwin->w_cursor.lnum, currsize, | |
| 4640 curwin->w_cursor.lnum + 1, 0L); | |
| 4641 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4642 * Delete following lines. To do this we move the cursor there |
| 7 | 4643 * briefly, and then move it back. After del_lines() the cursor may |
| 4644 * have moved up (last line deleted), so the current lnum is kept in t. | |
| 4645 */ | |
| 4646 t = curwin->w_cursor.lnum; | |
| 4647 ++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
|
4648 del_lines(count - 1, FALSE); |
| 7 | 4649 curwin->w_cursor.lnum = t; |
| 4650 | |
| 4651 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 * Set the cursor column: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4653 * 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
|
4654 * vim: use the column of the last join |
| 7 | 4655 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 curwin->w_cursor.col = |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
| 7 | 4658 check_cursor_col(); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4659 |
| 7 | 4660 curwin->w_cursor.coladd = 0; |
| 4661 curwin->w_set_curswant = TRUE; | |
| 4662 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 theend: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4664 vim_free(spaces); |
| 3562 | 4665 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4666 if (remove_comments) | |
| 4667 vim_free(comments); | |
| 4668 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4669 return ret; |
| 7 | 4670 } |
| 4671 | |
| 4672 #ifdef FEAT_COMMENTS | |
| 4673 /* | |
| 4674 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
| 4675 * the first line. White-space is ignored. Note that the whole of | |
| 4676 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
| 4677 */ | |
| 4678 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4679 same_leader( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4680 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4681 int leader1_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4682 char_u *leader1_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4683 int leader2_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4684 char_u *leader2_flags) |
| 7 | 4685 { |
| 4686 int idx1 = 0, idx2 = 0; | |
| 4687 char_u *p; | |
| 4688 char_u *line1; | |
| 4689 char_u *line2; | |
| 4690 | |
| 4691 if (leader1_len == 0) | |
| 4692 return (leader2_len == 0); | |
| 4693 | |
| 4694 /* | |
| 4695 * If first leader has 'f' flag, the lines can be joined only if the | |
| 4696 * second line does not have a leader. | |
| 4697 * If first leader has 'e' flag, the lines can never be joined. | |
| 4698 * If fist leader has 's' flag, the lines can only be joined if there is | |
| 4699 * some text after it and the second line has the 'm' flag. | |
| 4700 */ | |
| 4701 if (leader1_flags != NULL) | |
| 4702 { | |
| 4703 for (p = leader1_flags; *p && *p != ':'; ++p) | |
| 4704 { | |
| 4705 if (*p == COM_FIRST) | |
| 4706 return (leader2_len == 0); | |
| 4707 if (*p == COM_END) | |
| 4708 return FALSE; | |
| 4709 if (*p == COM_START) | |
| 4710 { | |
| 4711 if (*(ml_get(lnum) + leader1_len) == NUL) | |
| 4712 return FALSE; | |
| 4713 if (leader2_flags == NULL || leader2_len == 0) | |
| 4714 return FALSE; | |
| 4715 for (p = leader2_flags; *p && *p != ':'; ++p) | |
| 4716 if (*p == COM_MIDDLE) | |
| 4717 return TRUE; | |
| 4718 return FALSE; | |
| 4719 } | |
| 4720 } | |
| 4721 } | |
| 4722 | |
| 4723 /* | |
| 4724 * Get current line and next line, compare the leaders. | |
| 4725 * The first line has to be saved, only one line can be locked at a time. | |
| 4726 */ | |
| 4727 line1 = vim_strsave(ml_get(lnum)); | |
| 4728 if (line1 != NULL) | |
| 4729 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4730 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
| 7 | 4731 ; |
| 4732 line2 = ml_get(lnum + 1); | |
| 4733 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
| 4734 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4735 if (!VIM_ISWHITE(line2[idx2])) |
| 7 | 4736 { |
| 4737 if (line1[idx1++] != line2[idx2]) | |
| 4738 break; | |
| 4739 } | |
| 4740 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4741 while (VIM_ISWHITE(line1[idx1])) |
| 7 | 4742 ++idx1; |
| 4743 } | |
| 4744 vim_free(line1); | |
| 4745 } | |
| 4746 return (idx2 == leader2_len && idx1 == leader1_len); | |
| 4747 } | |
| 4748 #endif | |
| 4749 | |
| 4750 /* | |
| 3252 | 4751 * Implementation of the format operator 'gq'. |
| 7 | 4752 */ |
| 4753 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4754 op_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4755 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4756 int keep_cursor) /* keep cursor on same text char */ |
| 7 | 4757 { |
| 4758 long old_line_count = curbuf->b_ml.ml_line_count; | |
| 4759 | |
| 4760 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
| 4761 * can put it back there. */ | |
| 4762 curwin->w_cursor = oap->cursor_start; | |
| 4763 | |
| 4764 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 4765 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 4766 return; | |
| 4767 curwin->w_cursor = oap->start; | |
| 4768 | |
| 4769 if (oap->is_VIsual) | |
| 4770 /* When there is no change: need to remove the Visual selection */ | |
| 4771 redraw_curbuf_later(INVERTED); | |
| 4772 | |
| 4773 /* Set '[ mark at the start of the formatted area */ | |
| 4774 curbuf->b_op_start = oap->start; | |
| 4775 | |
| 4776 /* For "gw" remember the cursor position and put it back below (adjusted | |
| 4777 * for joined and split lines). */ | |
| 4778 if (keep_cursor) | |
| 4779 saved_cursor = oap->cursor_start; | |
| 4780 | |
| 1563 | 4781 format_lines(oap->line_count, keep_cursor); |
| 7 | 4782 |
| 4783 /* | |
| 4784 * Leave the cursor at the first non-blank of the last formatted line. | |
| 4785 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
| 4786 * line, so "." will do the next lines. | |
| 4787 */ | |
| 4788 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 4789 ++curwin->w_cursor.lnum; | |
| 4790 beginline(BL_WHITE | BL_FIX); | |
| 4791 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
| 4792 msgmore(old_line_count); | |
| 4793 | |
| 4794 /* put '] mark on the end of the formatted area */ | |
| 4795 curbuf->b_op_end = curwin->w_cursor; | |
| 4796 | |
| 4797 if (keep_cursor) | |
| 4798 { | |
| 4799 curwin->w_cursor = saved_cursor; | |
| 4800 saved_cursor.lnum = 0; | |
| 4801 } | |
| 4802 | |
| 4803 if (oap->is_VIsual) | |
| 4804 { | |
| 4805 win_T *wp; | |
| 4806 | |
| 4807 FOR_ALL_WINDOWS(wp) | |
| 4808 { | |
| 4809 if (wp->w_old_cursor_lnum != 0) | |
| 4810 { | |
| 4811 /* When lines have been inserted or deleted, adjust the end of | |
| 4812 * the Visual area to be redrawn. */ | |
| 4813 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
| 4814 wp->w_old_cursor_lnum += old_line_count; | |
| 4815 else | |
| 4816 wp->w_old_visual_lnum += old_line_count; | |
| 4817 } | |
| 4818 } | |
| 4819 } | |
| 4820 } | |
| 4821 | |
| 667 | 4822 #if defined(FEAT_EVAL) || defined(PROTO) |
| 4823 /* | |
| 4824 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
| 4825 */ | |
| 4826 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4827 op_formatexpr(oparg_T *oap) |
| 667 | 4828 { |
| 4829 if (oap->is_VIsual) | |
| 4830 /* When there is no change: need to remove the Visual selection */ | |
| 4831 redraw_curbuf_later(INVERTED); | |
| 4832 | |
|
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4833 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
|
4834 /* 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
|
4835 * internal formatting. */ |
|
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4836 op_format(oap, FALSE); |
| 667 | 4837 } |
| 4838 | |
| 4839 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4840 fex_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4841 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4842 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4843 int c) /* character to be inserted */ |
| 667 | 4844 { |
| 681 | 4845 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
| 4846 OPT_LOCAL); | |
| 667 | 4847 int r; |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4848 char_u *fex; |
| 667 | 4849 |
| 4850 /* | |
| 4851 * Set v:lnum to the first line number and v:count to the number of lines. | |
| 844 | 4852 * Set v:char to the character to be inserted (can be NUL). |
| 667 | 4853 */ |
| 4854 set_vim_var_nr(VV_LNUM, lnum); | |
| 4855 set_vim_var_nr(VV_COUNT, count); | |
| 1969 | 4856 set_vim_var_char(c); |
| 844 | 4857 |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4858 /* 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
|
4859 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
|
4860 if (fex == NULL) |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4861 return 0; |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4862 |
| 667 | 4863 /* |
| 4864 * Evaluate the function. | |
| 4865 */ | |
| 4866 if (use_sandbox) | |
| 4867 ++sandbox; | |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4868 r = (int)eval_to_number(fex); |
| 667 | 4869 if (use_sandbox) |
| 4870 --sandbox; | |
| 844 | 4871 |
| 4872 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
|
4873 vim_free(fex); |
| 844 | 4874 |
| 667 | 4875 return r; |
| 4876 } | |
| 4877 #endif | |
| 4878 | |
| 7 | 4879 /* |
| 4880 * Format "line_count" lines, starting at the cursor position. | |
| 4881 * When "line_count" is negative, format until the end of the paragraph. | |
| 4882 * Lines after the cursor line are saved for undo, caller must have saved the | |
| 4883 * first line. | |
| 4884 */ | |
| 4885 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4886 format_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4887 linenr_T line_count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4888 int avoid_fex) /* don't use 'formatexpr' */ |
| 7 | 4889 { |
| 4890 int max_len; | |
| 4891 int is_not_par; /* current line not part of parag. */ | |
| 4892 int next_is_not_par; /* next line not part of paragraph */ | |
| 4893 int is_end_par; /* at end of paragraph */ | |
| 4894 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
| 4895 int next_is_start_par = FALSE; | |
| 4896 #ifdef FEAT_COMMENTS | |
| 4897 int leader_len = 0; /* leader len of current line */ | |
| 4898 int next_leader_len; /* leader len of next line */ | |
| 4899 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 4900 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 4901 int do_comments; /* format comments */ | |
| 3584 | 4902 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
| 7 | 4903 #endif |
| 4904 int advance = TRUE; | |
| 3584 | 4905 int second_indent = -1; /* indent for second line (comment |
| 4906 * aware) */ | |
| 7 | 4907 int do_second_indent; |
| 4908 int do_number_indent; | |
| 4909 int do_trail_white; | |
| 4910 int first_par_line = TRUE; | |
| 4911 int smd_save; | |
| 4912 long count; | |
| 4913 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
| 4914 int force_format = FALSE; | |
| 4915 int old_State = State; | |
| 4916 | |
| 4917 /* length of a line to force formatting: 3 * 'tw' */ | |
| 4918 max_len = comp_textwidth(TRUE) * 3; | |
| 4919 | |
| 4920 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
| 4921 #ifdef FEAT_COMMENTS | |
| 4922 do_comments = has_format_option(FO_Q_COMS); | |
| 4923 #endif | |
| 4924 do_second_indent = has_format_option(FO_Q_SECOND); | |
| 4925 do_number_indent = has_format_option(FO_Q_NUMBER); | |
| 4926 do_trail_white = has_format_option(FO_WHITE_PAR); | |
| 4927 | |
| 4928 /* | |
| 4929 * Get info about the previous and current line. | |
| 4930 */ | |
| 4931 if (curwin->w_cursor.lnum > 1) | |
| 4932 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
| 4933 #ifdef FEAT_COMMENTS | |
| 4934 , &leader_len, &leader_flags, do_comments | |
| 4935 #endif | |
| 4936 ); | |
| 4937 else | |
| 4938 is_not_par = TRUE; | |
| 4939 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
| 4940 #ifdef FEAT_COMMENTS | |
| 4941 , &next_leader_len, &next_leader_flags, do_comments | |
| 4942 #endif | |
| 4943 ); | |
| 4944 is_end_par = (is_not_par || next_is_not_par); | |
| 4945 if (!is_end_par && do_trail_white) | |
| 4946 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
| 4947 | |
| 4948 curwin->w_cursor.lnum--; | |
| 4949 for (count = line_count; count != 0 && !got_int; --count) | |
| 4950 { | |
| 4951 /* | |
| 4952 * Advance to next paragraph. | |
| 4953 */ | |
| 4954 if (advance) | |
| 4955 { | |
| 4956 curwin->w_cursor.lnum++; | |
| 4957 prev_is_end_par = is_end_par; | |
| 4958 is_not_par = next_is_not_par; | |
| 4959 #ifdef FEAT_COMMENTS | |
| 4960 leader_len = next_leader_len; | |
| 4961 leader_flags = next_leader_flags; | |
| 4962 #endif | |
| 4963 } | |
| 4964 | |
| 4965 /* | |
| 4966 * The last line to be formatted. | |
| 4967 */ | |
| 4968 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4969 { | |
| 4970 next_is_not_par = TRUE; | |
| 4971 #ifdef FEAT_COMMENTS | |
| 4972 next_leader_len = 0; | |
| 4973 next_leader_flags = NULL; | |
| 4974 #endif | |
| 4975 } | |
| 4976 else | |
| 4977 { | |
| 4978 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
| 4979 #ifdef FEAT_COMMENTS | |
| 4980 , &next_leader_len, &next_leader_flags, do_comments | |
| 4981 #endif | |
| 4982 ); | |
| 4983 if (do_number_indent) | |
| 4984 next_is_start_par = | |
| 4985 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
| 4986 } | |
| 4987 advance = TRUE; | |
| 4988 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
| 4989 if (!is_end_par && do_trail_white) | |
| 4990 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
| 4991 | |
| 4992 /* | |
| 4993 * Skip lines that are not in a paragraph. | |
| 4994 */ | |
| 4995 if (is_not_par) | |
| 4996 { | |
| 4997 if (line_count < 0) | |
| 4998 break; | |
| 4999 } | |
| 5000 else | |
| 5001 { | |
| 5002 /* | |
| 5003 * For the first line of a paragraph, check indent of second line. | |
| 5004 * Don't do this for comments and empty lines. | |
| 5005 */ | |
| 5006 if (first_par_line | |
| 5007 && (do_second_indent || do_number_indent) | |
| 5008 && prev_is_end_par | |
| 3584 | 5009 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
| 5010 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5011 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
| 3584 | 5012 { |
| 5013 #ifdef FEAT_COMMENTS | |
| 5014 if (leader_len == 0 && next_leader_len == 0) | |
| 5015 { | |
| 5016 /* no comment found */ | |
| 5017 #endif | |
| 5018 second_indent = | |
| 5019 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
| 7 | 5020 #ifdef FEAT_COMMENTS |
| 3584 | 5021 } |
| 5022 else | |
| 5023 { | |
| 5024 second_indent = next_leader_len; | |
| 5025 do_comments_list = 1; | |
| 5026 } | |
| 5027 #endif | |
| 5028 } | |
| 7 | 5029 else if (do_number_indent) |
| 3584 | 5030 { |
| 5031 #ifdef FEAT_COMMENTS | |
| 5032 if (leader_len == 0 && next_leader_len == 0) | |
| 5033 { | |
| 5034 /* no comment found */ | |
| 5035 #endif | |
| 5036 second_indent = | |
| 5037 get_number_indent(curwin->w_cursor.lnum); | |
| 5038 #ifdef FEAT_COMMENTS | |
| 5039 } | |
| 5040 else | |
| 5041 { | |
| 5042 /* get_number_indent() is now "comment aware"... */ | |
| 5043 second_indent = | |
| 5044 get_number_indent(curwin->w_cursor.lnum); | |
| 5045 do_comments_list = 1; | |
| 5046 } | |
| 5047 #endif | |
| 5048 } | |
| 7 | 5049 } |
| 5050 | |
| 5051 /* | |
| 5052 * When the comment leader changes, it's the end of the paragraph. | |
| 5053 */ | |
| 5054 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
| 5055 #ifdef FEAT_COMMENTS | |
| 5056 || !same_leader(curwin->w_cursor.lnum, | |
| 5057 leader_len, leader_flags, | |
| 5058 next_leader_len, next_leader_flags) | |
| 5059 #endif | |
| 5060 ) | |
| 5061 is_end_par = TRUE; | |
| 5062 | |
| 5063 /* | |
| 5064 * If we have got to the end of a paragraph, or the line is | |
| 5065 * getting long, format it. | |
| 5066 */ | |
| 5067 if (is_end_par || force_format) | |
| 5068 { | |
| 5069 if (need_set_indent) | |
| 5070 /* replace indent in first line with minimal number of | |
| 5071 * tabs and spaces, according to current options */ | |
| 5072 (void)set_indent(get_indent(), SIN_CHANGED); | |
| 5073 | |
| 5074 /* put cursor on last non-space */ | |
| 5075 State = NORMAL; /* don't go past end-of-line */ | |
| 5076 coladvance((colnr_T)MAXCOL); | |
| 5077 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
| 5078 dec_cursor(); | |
| 5079 | |
| 5080 /* do the formatting, without 'showmode' */ | |
| 5081 State = INSERT; /* for open_line() */ | |
| 5082 smd_save = p_smd; | |
| 5083 p_smd = FALSE; | |
| 5084 insertchar(NUL, INSCHAR_FORMAT | |
| 5085 #ifdef FEAT_COMMENTS | |
| 5086 + (do_comments ? INSCHAR_DO_COM : 0) | |
| 3584 | 5087 + (do_comments && do_comments_list |
| 5088 ? INSCHAR_COM_LIST : 0) | |
| 7 | 5089 #endif |
| 1563 | 5090 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
| 7 | 5091 State = old_State; |
| 5092 p_smd = smd_save; | |
| 5093 second_indent = -1; | |
| 5094 /* at end of par.: need to set indent of next par. */ | |
| 5095 need_set_indent = is_end_par; | |
| 5096 if (is_end_par) | |
| 5097 { | |
| 5098 /* When called with a negative line count, break at the | |
| 5099 * end of the paragraph. */ | |
| 5100 if (line_count < 0) | |
| 5101 break; | |
| 5102 first_par_line = TRUE; | |
| 5103 } | |
| 5104 force_format = FALSE; | |
| 5105 } | |
| 5106 | |
| 5107 /* | |
| 5108 * When still in same paragraph, join the lines together. But | |
| 5403 | 5109 * first delete the leader from the second line. |
| 7 | 5110 */ |
| 5111 if (!is_end_par) | |
| 5112 { | |
| 5113 advance = FALSE; | |
| 5114 curwin->w_cursor.lnum++; | |
| 5115 curwin->w_cursor.col = 0; | |
| 5116 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
|
5117 break; |
| 7 | 5118 #ifdef FEAT_COMMENTS |
| 5119 if (next_leader_len > 0) | |
| 5403 | 5120 { |
| 5121 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
| 7 | 5122 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
|
5123 (long)-next_leader_len, 0); |
| 5403 | 5124 } else |
| 5125 #endif | |
| 5126 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
| 5127 { | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5128 int indent = getwhitecols_curline(); |
| 5403 | 5129 |
| 5130 if (indent > 0) | |
| 5131 { | |
| 5132 (void)del_bytes(indent, FALSE, FALSE); | |
| 5133 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
|
5134 (colnr_T)0, 0L, (long)-indent, 0); |
| 5415 | 5135 } |
| 5403 | 5136 } |
| 7 | 5137 curwin->w_cursor.lnum--; |
| 5848 | 5138 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
| 7 | 5139 { |
| 5140 beep_flush(); | |
| 5141 break; | |
| 5142 } | |
| 5143 first_par_line = FALSE; | |
| 5144 /* If the line is getting long, format it next time */ | |
| 5145 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
| 5146 force_format = TRUE; | |
| 5147 else | |
| 5148 force_format = FALSE; | |
| 5149 } | |
| 5150 } | |
| 5151 line_breakcheck(); | |
| 5152 } | |
| 5153 } | |
| 5154 | |
| 5155 /* | |
| 5156 * Return TRUE if line "lnum" ends in a white character. | |
| 5157 */ | |
| 5158 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5159 ends_in_white(linenr_T lnum) |
| 7 | 5160 { |
| 5161 char_u *s = ml_get(lnum); | |
| 5162 size_t l; | |
| 5163 | |
| 5164 if (*s == NUL) | |
| 5165 return FALSE; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5166 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
| 7 | 5167 * invocation may call function multiple times". */ |
| 5168 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
|
5169 return VIM_ISWHITE(s[l]); |
| 7 | 5170 } |
| 5171 | |
| 5172 /* | |
| 5173 * Blank lines, and lines containing only the comment leader, are left | |
| 5174 * untouched by the formatting. The function returns TRUE in this | |
| 5175 * case. It also returns TRUE when a line starts with the end of a comment | |
| 5176 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
| 5177 * previous line. A new paragraph starts after a blank line, or when the | |
| 5178 * comment leader changes -- webb. | |
| 5179 */ | |
| 5180 #ifdef FEAT_COMMENTS | |
| 5181 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5182 fmt_check_par( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5183 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5184 int *leader_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5185 char_u **leader_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5186 int do_comments) |
| 7 | 5187 { |
| 5188 char_u *flags = NULL; /* init for GCC */ | |
| 5189 char_u *ptr; | |
| 5190 | |
| 5191 ptr = ml_get(lnum); | |
| 5192 if (do_comments) | |
| 3562 | 5193 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
| 7 | 5194 else |
| 5195 *leader_len = 0; | |
| 5196 | |
| 5197 if (*leader_len > 0) | |
| 5198 { | |
| 5199 /* | |
| 5200 * Search for 'e' flag in comment leader flags. | |
| 5201 */ | |
| 5202 flags = *leader_flags; | |
| 5203 while (*flags && *flags != ':' && *flags != COM_END) | |
| 5204 ++flags; | |
| 5205 } | |
| 5206 | |
| 5207 return (*skipwhite(ptr + *leader_len) == NUL | |
| 5208 || (*leader_len > 0 && *flags == COM_END) | |
| 5209 || startPS(lnum, NUL, FALSE)); | |
| 5210 } | |
| 5211 #else | |
| 5212 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5213 fmt_check_par(linenr_T lnum) |
| 7 | 5214 { |
| 5215 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
| 5216 } | |
| 5217 #endif | |
| 5218 | |
| 5219 /* | |
| 5220 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
| 5221 * previous line is in the same paragraph. Used for auto-formatting. | |
| 5222 */ | |
| 5223 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5224 paragraph_start(linenr_T lnum) |
| 7 | 5225 { |
| 5226 char_u *p; | |
| 5227 #ifdef FEAT_COMMENTS | |
| 5228 int leader_len = 0; /* leader len of current line */ | |
| 5229 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5230 int next_leader_len; /* leader len of next line */ | |
| 5231 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5232 int do_comments; /* format comments */ | |
| 5233 #endif | |
| 5234 | |
| 5235 if (lnum <= 1) | |
| 5236 return TRUE; /* start of the file */ | |
| 5237 | |
| 5238 p = ml_get(lnum - 1); | |
| 5239 if (*p == NUL) | |
| 5240 return TRUE; /* after empty line */ | |
| 5241 | |
| 5242 #ifdef FEAT_COMMENTS | |
| 5243 do_comments = has_format_option(FO_Q_COMS); | |
| 5244 #endif | |
| 5245 if (fmt_check_par(lnum - 1 | |
| 5246 #ifdef FEAT_COMMENTS | |
| 5247 , &leader_len, &leader_flags, do_comments | |
| 5248 #endif | |
| 5249 )) | |
| 5250 return TRUE; /* after non-paragraph line */ | |
| 5251 | |
| 5252 if (fmt_check_par(lnum | |
| 5253 #ifdef FEAT_COMMENTS | |
| 5254 , &next_leader_len, &next_leader_flags, do_comments | |
| 5255 #endif | |
| 5256 )) | |
| 5257 return TRUE; /* "lnum" is not a paragraph line */ | |
| 5258 | |
| 5259 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
| 5260 return TRUE; /* missing trailing space in previous line. */ | |
| 5261 | |
| 5262 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
| 5263 return TRUE; /* numbered item starts in "lnum". */ | |
| 5264 | |
| 5265 #ifdef FEAT_COMMENTS | |
| 5266 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
| 5267 next_leader_len, next_leader_flags)) | |
| 5268 return TRUE; /* change of comment leader. */ | |
| 5269 #endif | |
| 5270 | |
| 5271 return FALSE; | |
| 5272 } | |
| 5273 | |
| 5274 /* | |
| 5275 * prepare a few things for block mode yank/delete/tilde | |
| 5276 * | |
| 5277 * for delete: | |
| 5278 * - textlen includes the first/last char to be (partly) deleted | |
| 5279 * - start/endspaces is the number of columns that are taken by the | |
| 5280 * first/last deleted char minus the number of columns that have to be | |
| 1839 | 5281 * deleted. |
| 5282 * for yank and tilde: | |
| 7 | 5283 * - textlen includes the first/last char to be wholly yanked |
| 5284 * - start/endspaces is the number of columns of the first/last yanked char | |
| 5285 * that are to be yanked. | |
| 5286 */ | |
| 5287 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5288 block_prep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5289 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5290 struct block_def *bdp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5291 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5292 int is_del) |
| 7 | 5293 { |
| 5294 int incr = 0; | |
| 5295 char_u *pend; | |
| 5296 char_u *pstart; | |
| 5297 char_u *line; | |
| 5298 char_u *prev_pstart; | |
| 5299 char_u *prev_pend; | |
| 5300 | |
| 5301 bdp->startspaces = 0; | |
| 5302 bdp->endspaces = 0; | |
| 5303 bdp->textlen = 0; | |
| 5304 bdp->start_vcol = 0; | |
| 5305 bdp->end_vcol = 0; | |
| 5306 bdp->is_short = FALSE; | |
| 5307 bdp->is_oneChar = FALSE; | |
| 5308 bdp->pre_whitesp = 0; | |
| 5309 bdp->pre_whitesp_c = 0; | |
| 5310 bdp->end_char_vcols = 0; | |
| 5311 bdp->start_char_vcols = 0; | |
| 5312 | |
| 5313 line = ml_get(lnum); | |
| 5314 pstart = line; | |
| 5315 prev_pstart = line; | |
| 5316 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
| 5317 { | |
| 5318 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 5319 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
| 7 | 5320 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
|
5321 if (VIM_ISWHITE(*pstart)) |
| 7 | 5322 { |
| 5323 bdp->pre_whitesp += incr; | |
| 5324 bdp->pre_whitesp_c++; | |
| 5325 } | |
| 5326 else | |
| 5327 { | |
| 5328 bdp->pre_whitesp = 0; | |
| 5329 bdp->pre_whitesp_c = 0; | |
| 5330 } | |
| 5331 prev_pstart = pstart; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5332 MB_PTR_ADV(pstart); |
| 7 | 5333 } |
| 5334 bdp->start_char_vcols = incr; | |
| 5335 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
| 5336 { | |
| 5337 bdp->end_vcol = bdp->start_vcol; | |
| 5338 bdp->is_short = TRUE; | |
| 5339 if (!is_del || oap->op_type == OP_APPEND) | |
| 5340 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5341 } | |
| 5342 else | |
| 5343 { | |
| 5344 /* notice: this converts partly selected Multibyte characters to | |
| 5345 * spaces, too. */ | |
| 5346 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
| 5347 if (is_del && bdp->startspaces) | |
| 5348 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5349 pend = pstart; | |
| 5350 bdp->end_vcol = bdp->start_vcol; | |
| 5351 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
| 5352 { | |
| 5353 bdp->is_oneChar = TRUE; | |
| 5354 if (oap->op_type == OP_INSERT) | |
| 5355 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5356 else if (oap->op_type == OP_APPEND) | |
| 5357 { | |
| 5358 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
| 5359 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5360 } | |
| 5361 else | |
| 5362 { | |
| 5363 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5364 if (is_del && oap->op_type != OP_LSHIFT) | |
| 5365 { | |
| 5366 /* just putting the sum of those two into | |
| 5367 * bdp->startspaces doesn't work for Visual replace, | |
| 5368 * so we have to split the tab in two */ | |
| 5369 bdp->startspaces = bdp->start_char_vcols | |
| 5370 - (bdp->start_vcol - oap->start_vcol); | |
| 5371 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5372 } | |
| 5373 } | |
| 5374 } | |
| 5375 else | |
| 5376 { | |
| 5377 prev_pend = pend; | |
| 5378 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
| 5379 { | |
| 5380 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5381 prev_pend = pend; | |
| 6535 | 5382 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
| 7 | 5383 bdp->end_vcol += incr; |
| 5384 } | |
| 5385 if (bdp->end_vcol <= oap->end_vcol | |
| 5386 && (!is_del | |
| 5387 || oap->op_type == OP_APPEND | |
| 5388 || oap->op_type == OP_REPLACE)) /* line too short */ | |
| 5389 { | |
| 5390 bdp->is_short = TRUE; | |
| 5391 /* Alternative: include spaces to fill up the block. | |
| 5392 * Disadvantage: can lead to trailing spaces when the line is | |
| 5393 * short where the text is put */ | |
| 5394 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
| 5395 if (oap->op_type == OP_APPEND || virtual_op) | |
| 5396 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
| 593 | 5397 + oap->inclusive; |
| 7 | 5398 else |
| 5399 bdp->endspaces = 0; /* replace doesn't add characters */ | |
| 5400 } | |
| 5401 else if (bdp->end_vcol > oap->end_vcol) | |
| 5402 { | |
| 5403 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5404 if (!is_del && bdp->endspaces) | |
| 5405 { | |
| 5406 bdp->endspaces = incr - bdp->endspaces; | |
| 5407 if (pend != pstart) | |
| 5408 pend = prev_pend; | |
| 5409 } | |
| 5410 } | |
| 5411 } | |
| 5412 bdp->end_char_vcols = incr; | |
| 5413 if (is_del && bdp->startspaces) | |
| 5414 pstart = prev_pstart; | |
| 5415 bdp->textlen = (int)(pend - pstart); | |
| 5416 } | |
| 5417 bdp->textcol = (colnr_T) (pstart - line); | |
| 5418 bdp->textstart = pstart; | |
| 5419 } | |
| 5420 | |
| 5421 /* | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5422 * Handle the add/subtract operator. |
| 7 | 5423 */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5424 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5425 op_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5426 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5427 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
|
5428 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
|
5429 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5430 pos_T pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5431 struct block_def bd; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5432 int change_cnt = 0; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 linenr_T amount = Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5435 // do_addsub() might trigger re-evaluation of 'foldexpr' halfway, when the |
|
15967
ddd82b1c9e9d
patch 8.1.0989: various small code ugliness
Bram Moolenaar <Bram@vim.org>
parents:
15840
diff
changeset
|
5436 // buffer is not completely updated yet. Postpone updating folds until before |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5437 // 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
|
5438 #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
|
5439 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
|
5440 #endif |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5441 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5442 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5443 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5444 pos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5445 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
|
5446 { |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5447 #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
|
5448 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
|
5449 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5450 return; |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5451 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5452 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
|
5453 #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
|
5454 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
|
5455 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5457 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
|
5458 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5459 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5461 int one_change; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5462 int length; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5463 pos_T startpos; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5465 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
|
5466 (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
|
5467 { |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5468 #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
|
5469 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
|
5470 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5471 return; |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5472 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5474 pos = oap->start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 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
|
5476 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 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
|
5478 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 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
|
5480 pos.col = bd.textcol; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5481 length = bd.textlen; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5482 } |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5483 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
|
5484 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5485 curwin->w_cursor.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5486 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5487 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
|
5488 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5489 else /* oap->motion_type == MCHAR */ |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5490 { |
|
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5491 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
|
5492 dec(&(oap->end)); |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5493 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
|
5494 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5495 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
|
5496 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5497 pos.col += oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5498 length -= oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5499 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5500 if (pos.lnum == oap->end.lnum) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5501 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5502 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
|
5503 if (oap->end.col >= length) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5504 oap->end.col = length - 1; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5505 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
|
5506 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5507 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5508 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
|
5509 if (one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5510 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5511 /* 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
|
5512 if (change_cnt == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5513 startpos = curbuf->b_op_start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 ++change_cnt; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 #ifdef FEAT_NETBEANS_INTG |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 if (netbeans_active() && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 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
|
5521 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 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
|
5523 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
|
5524 &ptr[pos.col], length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5527 if (g_cmd && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5528 amount += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5529 } |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5530 |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5531 #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
|
5532 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
|
5533 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5534 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5535 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
|
5536 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5537 if (!change_cnt && oap->is_VIsual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5538 /* 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
|
5539 redraw_curbuf_later(INVERTED); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5540 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5541 /* 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
|
5542 * position from do_addsub(). */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5543 if (change_cnt > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 curbuf->b_op_start = startpos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5546 if (change_cnt > p_report) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
5547 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
5548 change_cnt), change_cnt); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5549 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5550 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5551 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5552 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5553 * 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
|
5554 * 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
|
5555 * |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 * 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
|
5557 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5558 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5559 do_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5560 int op_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5561 pos_T *pos, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5562 int length, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5563 linenr_T Prenum1) |
| 7 | 5564 { |
| 5565 int col; | |
| 5566 char_u *buf1; | |
| 5567 char_u buf2[NUMBUFLEN]; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5568 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
| 7 | 5569 static int hexupper = FALSE; /* 0xABC */ |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5570 uvarnumber_T n; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5571 uvarnumber_T oldn; |
| 7 | 5572 char_u *ptr; |
| 5573 int c; | |
| 5574 int todel; | |
| 5575 int dohex; | |
| 5576 int dooct; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5577 int dobin; |
| 7 | 5578 int doalp; |
| 5579 int firstdigit; | |
| 5580 int subtract; | |
| 6868 | 5581 int negative = FALSE; |
| 6891 | 5582 int was_positive = TRUE; |
| 6868 | 5583 int visual = VIsual_active; |
| 6921 | 5584 int did_change = FALSE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5585 pos_T save_cursor = curwin->w_cursor; |
| 6927 | 5586 int maxlen = 0; |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5587 pos_T startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5588 pos_T endpos; |
| 7 | 5589 |
| 5590 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
| 5591 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
|
5592 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
| 7 | 5593 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
| 5594 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5595 curwin->w_cursor = *pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5596 ptr = ml_get(pos->lnum); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5597 col = pos->col; |
|
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 if (*ptr == NUL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 |
| 7 | 5602 /* |
| 5603 * First check if we are on a hexadecimal number, after the "0x". | |
| 5604 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5606 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5607 if (dobin) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5608 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
|
5609 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5610 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5611 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5612 col -= (*mb_head_off)(ptr, ptr + col); |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5613 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5614 |
| 6868 | 5615 if (dohex) |
| 5616 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
|
5617 { |
| 6868 | 5618 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5619 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5620 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
|
5621 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5622 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5623 if ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5624 && dohex |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5625 && ! ((col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5626 && (ptr[col] == 'X' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5627 || ptr[col] == 'x') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5628 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5629 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5630 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5631 && vim_isxdigit(ptr[col + 1])))) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5632 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5633 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5634 /* 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
|
5635 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5636 col = pos->col; |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5637 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5638 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
|
5639 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5640 col--; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5641 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5642 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
|
5643 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5644 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5645 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5646 if (( dohex |
| 6868 | 5647 && col > 0 |
| 5648 && (ptr[col] == 'X' | |
| 5649 || ptr[col] == 'x') | |
| 5650 && ptr[col - 1] == '0' | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5651 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5652 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5653 && vim_isxdigit(ptr[col + 1])) || |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5654 ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5655 && col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5656 && (ptr[col] == 'B' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5657 || ptr[col] == 'b') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5658 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5659 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5660 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5661 && vim_isbdigit(ptr[col + 1]))) |
| 6868 | 5662 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5663 /* Found hexadecimal or binary number, move to its start. */ |
| 7 | 5664 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5665 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5666 col -= (*mb_head_off)(ptr, ptr + col); |
| 6868 | 5667 } |
| 5668 else | |
| 7 | 5669 { |
| 6868 | 5670 /* |
| 5671 * Search forward and then backward to find the start of number. | |
| 5672 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 col = pos->col; |
| 6868 | 5674 |
| 5675 while (ptr[col] != NUL | |
| 5676 && !vim_isdigit(ptr[col]) | |
| 5677 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5678 col += MB_PTR2LEN(ptr + col); |
| 6868 | 5679 |
| 5680 while (col > 0 | |
| 5681 && vim_isdigit(ptr[col - 1]) | |
| 5682 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5683 { |
| 6868 | 5684 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5685 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5686 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
|
5687 } |
| 6868 | 5688 } |
| 5689 } | |
| 5690 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 if (visual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 while (ptr[col] != NUL && length > 0 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5694 && !vim_isdigit(ptr[col]) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5697 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
|
5698 |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5699 col += mb_len; |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5700 length -= mb_len; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 if (length == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5704 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5706 if (col > pos->col && ptr[col - 1] == '-' |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5707 && (!has_mbyte || !(*mb_head_off)(ptr, ptr + col - 1))) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 was_positive = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5711 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5712 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 * 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
|
5716 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 firstdigit = ptr[col]; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 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
|
5719 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 beep_flush(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 if (doalp && ASCII_ISALPHA(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 /* decrement or increment alphabetic character */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 if (CharOrd(firstdigit) < Prenum1) |
| 6927 | 5730 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 firstdigit = 'A'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 firstdigit = 'a'; |
| 6927 | 5735 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 firstdigit -= Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
| 6927 | 5746 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5747 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 firstdigit = 'Z'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 firstdigit = 'z'; |
| 6927 | 5751 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 firstdigit += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5762 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 (void)del_char(FALSE); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5764 ins_char(firstdigit); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5769 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5770 if (col > 0 && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5771 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5772 !(*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
|
5773 && !visual) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 /* negative number */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5776 --col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5777 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 /* get the number value (unsigned) */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 if (visual && VIsual_mode != 'V') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 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
|
5782 ? (int)STRLEN(ptr) - col |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 : length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 vim_str2nr(ptr + col, &pre, &length, |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 0 + (dobin ? STR2NR_BIN : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 + (dooct ? STR2NR_OCT : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 + (dohex ? STR2NR_HEX : 0), |
|
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16698
diff
changeset
|
5789 NULL, &n, maxlen, FALSE); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 /* 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
|
5792 if (pre && negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 ++col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 negative = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 /* add or subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 subtract = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 if (negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 oldn = n; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 if (subtract) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5807 n -= (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5809 n += (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 /* handle wraparound for decimal numbers */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 if (!pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 if (subtract) |
| 6927 | 5814 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 if (n > oldn) |
| 6868 | 5816 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5817 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
|
5818 negative ^= TRUE; |
| 6868 | 5819 } |
| 7 | 5820 } |
| 5821 else | |
| 6868 | 5822 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 if (n < oldn) |
| 6868 | 5825 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5826 n = (n ^ (uvarnumber_T)-1); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 negative ^= TRUE; |
| 6868 | 5828 } |
| 6927 | 5829 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 if (n == 0) |
| 6868 | 5831 negative = FALSE; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 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
|
5835 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 /* need to remove the '-' */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 col--; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 length++; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 * Delete the old number. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 todel = length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 c = gchar_cursor(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 * 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
|
5852 * 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
|
5853 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 if (c == '-') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 while (todel-- > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5857 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5858 if (c < 0x100 && isalpha(c)) |
| 6868 | 5859 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 if (isupper(c)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 hexupper = TRUE; |
| 6868 | 5862 else |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5863 hexupper = FALSE; |
| 6891 | 5864 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 /* 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
|
5866 (void)del_char(FALSE); |
| 6868 | 5867 c = gchar_cursor(); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 |
|
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 * Prepare the leading characters in buf1[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 * 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
|
5873 * Allocate a bit too much. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 */ |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
5875 buf1 = alloc(length + NUMBUFLEN); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 if (buf1 == NULL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 ptr = buf1; |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5879 if (negative && (!visual || was_positive)) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 *ptr++ = '-'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 if (pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 *ptr++ = '0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 if (pre == 'b' || pre == 'B' || |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 pre == 'x' || pre == 'X') |
|
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 *ptr++ = pre; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 } |
|
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 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 * Put the number characters in buf2[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 if (pre == 'b' || pre == 'B') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 int i; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 int bit = 0; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5900 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
|
5901 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 /* leading zeros */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 for (bit = bits; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5904 if ((n >> (bit - 1)) & 0x1) break; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 for (i = 0; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 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
|
5908 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 buf2[i] = '\0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 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
|
5912 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5913 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 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
|
5915 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5916 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5917 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
|
5918 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5919 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 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
|
5921 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5922 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5923 length -= (int)STRLEN(buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5926 * 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
|
5927 * 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
|
5928 * Don't do this when |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 * 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
|
5930 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 if (firstdigit == '0' && !(dooct && pre == 0)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 while (length-- > 0) |
| 6868 | 5933 *ptr++ = '0'; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 *ptr = NUL; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 STRCAT(buf1, buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 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
|
5937 vim_free(buf1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 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
|
5940 --curwin->w_cursor.col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5943 if (did_change) |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5944 { |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5945 /* set the '[ and '] marks */ |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5946 curbuf->b_op_start = startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5947 curbuf->b_op_end = endpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5948 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
|
5949 --curbuf->b_op_end.col; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5950 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5951 |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5952 theend: |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5953 if (visual) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5954 curwin->w_cursor = save_cursor; |
|
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5955 else if (did_change) |
|
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5956 curwin->w_set_curswant = TRUE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5957 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5958 return did_change; |
| 7 | 5959 } |
| 5960 | |
| 5961 #ifdef FEAT_VIMINFO | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5962 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5963 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
|
5964 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5965 #define REG_PREVIOUS 1 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5966 #define REG_EXEC 2 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5967 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5968 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5969 * 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
|
5970 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5971 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5972 prepare_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5973 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5974 y_read_regs = ALLOC_CLEAR_MULT(yankreg_T, NUM_REGISTERS); |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5975 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5976 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5977 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5978 finish_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5979 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5980 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5981 int j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5982 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5983 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5984 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5985 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
|
5986 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
|
5987 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5988 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
|
5989 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
|
5990 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
|
5991 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
5992 VIM_CLEAR(y_read_regs); |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5993 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5994 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5995 |
| 7 | 5996 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5997 read_viminfo_register(vir_T *virp, int force) |
| 7 | 5998 { |
| 5999 int eof; | |
| 6000 int do_it = TRUE; | |
| 6001 int size; | |
| 6002 int limit; | |
| 6003 int i; | |
| 6004 int set_prev = FALSE; | |
| 6005 char_u *str; | |
| 6006 char_u **array = NULL; | |
| 6508 | 6007 int new_type = MCHAR; /* init to shut up compiler */ |
| 6008 colnr_T new_width = 0; /* init to shut up compiler */ | |
| 7 | 6009 |
| 6010 /* We only get here (hopefully) if line[0] == '"' */ | |
| 6011 str = virp->vir_line + 1; | |
| 1893 | 6012 |
| 6013 /* If the line starts with "" this is the y_previous register. */ | |
| 7 | 6014 if (*str == '"') |
| 6015 { | |
| 6016 set_prev = TRUE; | |
| 6017 str++; | |
| 6018 } | |
| 1893 | 6019 |
| 7 | 6020 if (!ASCII_ISALNUM(*str) && *str != '-') |
| 6021 { | |
| 6022 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
| 6023 return TRUE; /* too many errors, pretend end-of-file */ | |
| 6024 do_it = FALSE; | |
| 6025 } | |
| 6026 get_yank_register(*str++, FALSE); | |
| 6027 if (!force && y_current->y_array != NULL) | |
| 6028 do_it = FALSE; | |
| 1893 | 6029 |
| 6030 if (*str == '@') | |
| 6031 { | |
| 6032 /* "x@: register x used for @@ */ | |
| 6033 if (force || execreg_lastc == NUL) | |
| 6034 execreg_lastc = str[-1]; | |
| 6035 } | |
| 6036 | |
| 7 | 6037 size = 0; |
| 6038 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
| 6039 if (do_it) | |
| 6040 { | |
| 6462 | 6041 /* |
| 6042 * Build the new register in array[]. | |
| 6043 * y_array is kept as-is until done. | |
| 6044 * The "do_it" flag is reset when something is wrong, in which case | |
| 6045 * array[] needs to be freed. | |
| 6046 */ | |
| 7 | 6047 if (set_prev) |
| 6048 y_previous = y_current; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6049 array = ALLOC_MULT(char_u *, limit); |
| 1893 | 6050 str = skipwhite(skiptowhite(str)); |
| 7 | 6051 if (STRNCMP(str, "CHAR", 4) == 0) |
| 6462 | 6052 new_type = MCHAR; |
| 7 | 6053 else if (STRNCMP(str, "BLOCK", 5) == 0) |
| 6462 | 6054 new_type = MBLOCK; |
| 7 | 6055 else |
| 6462 | 6056 new_type = MLINE; |
| 7 | 6057 /* get the block width; if it's missing we get a zero, which is OK */ |
| 6058 str = skipwhite(skiptowhite(str)); | |
| 6462 | 6059 new_width = getdigits(&str); |
| 7 | 6060 } |
| 6061 | |
| 6062 while (!(eof = viminfo_readline(virp)) | |
| 6063 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
| 6064 { | |
| 6065 if (do_it) | |
| 6066 { | |
| 6462 | 6067 if (size == limit) |
| 7 | 6068 { |
| 6462 | 6069 char_u **new_array = (char_u **) |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
6070 alloc(limit * 2 * sizeof(char_u *)); |
| 6462 | 6071 |
| 6072 if (new_array == NULL) | |
| 6073 { | |
| 6074 do_it = FALSE; | |
| 6075 break; | |
| 6076 } | |
| 7 | 6077 for (i = 0; i < limit; i++) |
| 6462 | 6078 new_array[i] = array[i]; |
| 7 | 6079 vim_free(array); |
| 6462 | 6080 array = new_array; |
| 7 | 6081 limit *= 2; |
| 6082 } | |
| 6083 str = viminfo_readstring(virp, 1, TRUE); | |
| 6084 if (str != NULL) | |
| 6085 array[size++] = str; | |
| 6086 else | |
| 6462 | 6087 /* error, don't store the result */ |
| 7 | 6088 do_it = FALSE; |
| 6089 } | |
| 6090 } | |
| 6508 | 6091 |
| 7 | 6092 if (do_it) |
| 6093 { | |
| 6462 | 6094 /* free y_array[] */ |
| 6095 for (i = 0; i < y_current->y_size; i++) | |
| 6096 vim_free(y_current->y_array[i]); | |
| 6097 vim_free(y_current->y_array); | |
| 6098 | |
| 6099 y_current->y_type = new_type; | |
| 6100 y_current->y_width = new_width; | |
| 6101 y_current->y_size = size; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 y_current->y_time_set = 0; |
| 7 | 6103 if (size == 0) |
| 6104 { | |
| 6105 y_current->y_array = NULL; | |
| 6106 } | |
| 6462 | 6107 else |
| 7 | 6108 { |
| 6462 | 6109 /* Move the lines from array[] to y_array[]. */ |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6110 y_current->y_array = ALLOC_MULT(char_u *, size); |
| 7 | 6111 for (i = 0; i < size; i++) |
| 6462 | 6112 { |
| 6113 if (y_current->y_array == NULL) | |
| 6114 vim_free(array[i]); | |
| 6115 else | |
| 6116 y_current->y_array[i] = array[i]; | |
| 6117 } | |
| 7 | 6118 } |
| 6462 | 6119 } |
| 6120 else | |
| 6121 { | |
| 6122 /* Free array[] if it was filled. */ | |
| 6123 for (i = 0; i < size; i++) | |
| 6124 vim_free(array[i]); | |
| 6125 } | |
| 6126 vim_free(array); | |
| 6127 | |
| 7 | 6128 return eof; |
| 6129 } | |
| 6130 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6131 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6132 * 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
|
6133 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 void |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6135 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
|
6136 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 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
|
6138 int flags; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6139 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 int type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 int linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6142 int width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 time_t timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 yankreg_T *y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6145 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6146 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6147 /* Check the format: |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6151 if (values->ga_len < 6 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6152 || vp[0].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 || vp[1].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6154 || vp[2].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 || vp[3].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6156 || vp[4].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 || vp[5].bv_type != BVAL_NR) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6158 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 flags = vp[0].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6160 name = vp[1].bv_nr; |
|
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6161 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
|
6162 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6163 type = vp[2].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6164 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
|
6165 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6166 linecount = vp[3].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6167 if (values->ga_len < 6 + linecount) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 width = vp[4].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 if (width < 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 /* 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
|
6175 * 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
|
6176 y_ptr = &y_read_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6177 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6178 y_ptr = &y_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6179 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6180 /* 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
|
6181 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
|
6182 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
|
6183 && (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
|
6184 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6185 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6186 if (y_ptr->y_array != NULL) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6187 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
|
6188 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
|
6189 vim_free(y_ptr->y_array); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6190 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6191 if (y_read_regs == NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6192 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6193 if (flags & REG_PREVIOUS) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6194 y_previous = y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6195 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
|
6196 execreg_lastc = get_register_name(name); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6197 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6198 y_ptr->y_type = type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6199 y_ptr->y_width = width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6200 y_ptr->y_size = linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6201 y_ptr->y_time_set = timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6202 if (linecount == 0) |
|
16429
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6203 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6204 y_ptr->y_array = NULL; |
|
16429
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6205 return; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6206 } |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6207 y_ptr->y_array = ALLOC_MULT(char_u *, linecount); |
|
16429
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6208 if (y_ptr->y_array == NULL) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6209 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6210 y_ptr->y_size = 0; // ensure object state is consistent |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6211 return; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6212 } |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6213 for (i = 0; i < linecount; i++) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6214 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6215 if (vp[i + 6].bv_allocated) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6216 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6217 y_ptr->y_array[i] = vp[i + 6].bv_string; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6218 vp[i + 6].bv_string = NULL; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6219 } |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6220 else |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6221 y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string); |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6222 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6223 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6224 |
| 7 | 6225 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6226 write_viminfo_registers(FILE *fp) |
| 7 | 6227 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6228 int i, j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6229 char_u *type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6230 char_u c; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6231 int num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6232 int max_num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6233 int max_kbyte; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6234 long len; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6235 yankreg_T *y_ptr; |
| 7 | 6236 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6237 fputs(_("\n# Registers:\n"), fp); |
| 7 | 6238 |
| 6239 /* Get '<' value, use old '"' value if '<' is not found. */ | |
| 6240 max_num_lines = get_viminfo_parameter('<'); | |
| 6241 if (max_num_lines < 0) | |
| 6242 max_num_lines = get_viminfo_parameter('"'); | |
| 6243 if (max_num_lines == 0) | |
| 6244 return; | |
| 6245 max_kbyte = get_viminfo_parameter('s'); | |
| 6246 if (max_kbyte == 0) | |
| 6247 return; | |
| 1893 | 6248 |
| 7 | 6249 for (i = 0; i < NUM_REGISTERS; i++) |
| 6250 { | |
| 6251 #ifdef FEAT_CLIPBOARD | |
| 6252 /* Skip '*'/'+' register, we don't want them back next time */ | |
| 6253 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
| 6254 continue; | |
| 6255 #endif | |
| 6256 #ifdef FEAT_DND | |
| 6257 /* Neither do we want the '~' register */ | |
| 6258 if (i == TILDE_REGISTER) | |
| 6259 continue; | |
| 6260 #endif | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 /* 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
|
6262 * viminfo if it's newer. */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 if (y_read_regs != NULL |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 && 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
|
6265 && (y_regs[i].y_array == NULL || |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 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
|
6267 y_ptr = &y_read_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 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
|
6269 continue; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 y_ptr = &y_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6272 |
| 55 | 6273 /* Skip empty registers. */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 num_lines = y_ptr->y_size; |
| 55 | 6275 if (num_lines == 0 |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 || (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
|
6277 && *y_ptr->y_array[0] == NUL)) |
| 55 | 6278 continue; |
| 6279 | |
| 7 | 6280 if (max_kbyte > 0) |
| 6281 { | |
| 6282 /* Skip register if there is more text than the maximum size. */ | |
| 6283 len = 0; | |
| 6284 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
|
6285 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
| 7 | 6286 if (len > (long)max_kbyte * 1024L) |
| 6287 continue; | |
| 6288 } | |
| 6289 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 switch (y_ptr->y_type) |
| 7 | 6291 { |
| 6292 case MLINE: | |
| 6293 type = (char_u *)"LINE"; | |
| 6294 break; | |
| 6295 case MCHAR: | |
| 6296 type = (char_u *)"CHAR"; | |
| 6297 break; | |
| 6298 case MBLOCK: | |
| 6299 type = (char_u *)"BLOCK"; | |
| 6300 break; | |
| 6301 default: | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6302 semsg(_("E574: Unknown register type %d"), y_ptr->y_type); |
| 7 | 6303 type = (char_u *)"LINE"; |
| 6304 break; | |
| 6305 } | |
| 6306 if (y_previous == &y_regs[i]) | |
| 6307 fprintf(fp, "\""); | |
| 6308 c = get_register_name(i); | |
| 1893 | 6309 fprintf(fp, "\"%c", c); |
| 6310 if (c == execreg_lastc) | |
| 6311 fprintf(fp, "@"); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6312 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
| 7 | 6313 |
| 6314 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
| 6315 if (max_num_lines > 0 && num_lines > max_num_lines) | |
| 6316 num_lines = max_num_lines; | |
| 6317 for (j = 0; j < num_lines; j++) | |
| 6318 { | |
| 6319 putc('\t', fp); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6320 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
|
6321 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6322 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6323 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6324 int flags = 0; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6325 int remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6326 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6327 /* 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
|
6328 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6329 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6330 * 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
|
6331 * REG_EXEC - used for @@ |
|
9272
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 if (y_previous == &y_regs[i]) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6334 flags |= REG_PREVIOUS; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6335 if (c == execreg_lastc) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6336 flags |= REG_EXEC; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6337 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
|
6338 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
|
6339 (long)y_ptr->y_time_set); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6340 /* 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
|
6341 remaining = LSIZE - 71; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6342 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
|
6343 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6344 putc(',', fp); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6345 --remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6346 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
|
6347 remaining); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6348 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6349 putc('\n', fp); |
| 7 | 6350 } |
| 6351 } | |
| 6352 } | |
| 6353 #endif /* FEAT_VIMINFO */ | |
| 6354 | |
| 6355 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 6356 /* | |
| 6357 * SELECTION / PRIMARY ('*') | |
| 6358 * | |
| 6359 * Text selection stuff that uses the GUI selection register '*'. When using a | |
| 6360 * GUI this may be text from another window, otherwise it is the last text we | |
| 6361 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
| 6362 * button performs the paste, otherwise you will need to do <"*p>. " | |
| 6363 * If not under X, it is synonymous with the clipboard register '+'. | |
| 6364 * | |
| 6365 * X CLIPBOARD ('+') | |
| 6366 * | |
| 6367 * Text selection stuff that uses the GUI clipboard register '+'. | |
| 6368 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
| 6369 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
| 6370 * otherwise you will need to do <"+p>. " | |
| 6371 * If not under X, it is synonymous with the selection register '*'. | |
| 6372 */ | |
| 6373 | |
| 6374 /* | |
| 6375 * 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
|
6376 * so that the text is still available after Vim has exited. X selections |
| 7 | 6377 * only exist while the owning application exists, so we write to the |
| 6378 * permanent (while X runs) store CUT_BUFFER0. | |
| 6379 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
| 6380 * 'permanent' of the two), otherwise the PRIMARY one. | |
| 6381 * For now, use a hard-coded sanity limit of 1Mb of data. | |
| 6382 */ | |
|
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6383 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
| 7 | 6384 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6385 x11_export_final_selection(void) |
| 7 | 6386 { |
| 6387 Display *dpy; | |
| 6388 char_u *str = NULL; | |
| 6389 long_u len = 0; | |
| 6390 int motion_type = -1; | |
| 6391 | |
| 6392 # ifdef FEAT_GUI | |
| 6393 if (gui.in_use) | |
| 6394 dpy = X_DISPLAY; | |
| 6395 else | |
| 6396 # endif | |
| 6397 # ifdef FEAT_XCLIPBOARD | |
| 6398 dpy = xterm_dpy; | |
| 6399 # else | |
| 6400 return; | |
| 6401 # endif | |
| 6402 | |
| 6403 /* Get selection to export */ | |
| 6404 if (clip_plus.owned) | |
| 6405 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
| 6406 else if (clip_star.owned) | |
| 6407 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
| 6408 | |
| 6409 /* Check it's OK */ | |
| 6410 if (dpy != NULL && str != NULL && motion_type >= 0 | |
| 6411 && len < 1024*1024 && len > 0) | |
| 6412 { | |
| 4201 | 6413 int ok = TRUE; |
| 6414 | |
| 1924 | 6415 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
| 6416 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
| 6417 * encoding conversion usually doesn't work, so keep the text as-is. | |
| 6418 */ | |
| 6419 if (has_mbyte) | |
| 6420 { | |
| 6421 vimconv_T vc; | |
| 6422 | |
| 6423 vc.vc_type = CONV_NONE; | |
| 6424 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
| 6425 { | |
|
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6426 int intlen = len; |
|
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6427 char_u *conv_str; |
| 2007 | 6428 |
| 4201 | 6429 vc.vc_fail = TRUE; |
| 2007 | 6430 conv_str = string_convert(&vc, str, &intlen); |
| 6431 len = intlen; | |
| 1924 | 6432 if (conv_str != NULL) |
| 6433 { | |
| 6434 vim_free(str); | |
| 6435 str = conv_str; | |
| 6436 } | |
| 4201 | 6437 else |
| 6438 { | |
| 6439 ok = FALSE; | |
| 6440 } | |
| 1924 | 6441 convert_setup(&vc, NULL, NULL); |
| 6442 } | |
| 4201 | 6443 else |
| 6444 { | |
| 6445 ok = FALSE; | |
| 6446 } | |
| 1924 | 6447 } |
| 4201 | 6448 |
| 6449 /* Do not store the string if conversion failed. Better to use any | |
| 6450 * other selection than garbled text. */ | |
| 6451 if (ok) | |
| 6452 { | |
| 6453 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
| 6454 XFlush(dpy); | |
| 6455 } | |
| 7 | 6456 } |
| 6457 | |
| 6458 vim_free(str); | |
| 6459 } | |
| 6460 #endif | |
| 6461 | |
| 6462 void | |
|
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6463 clip_free_selection(Clipboard_T *cbd) |
| 7 | 6464 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6465 yankreg_T *y_ptr = y_current; |
| 7 | 6466 |
| 6467 if (cbd == &clip_plus) | |
| 6468 y_current = &y_regs[PLUS_REGISTER]; | |
| 6469 else | |
| 6470 y_current = &y_regs[STAR_REGISTER]; | |
| 6471 free_yank_all(); | |
| 6472 y_current->y_size = 0; | |
| 6473 y_current = y_ptr; | |
| 6474 } | |
| 6475 | |
| 6476 /* | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
6477 * Get the selected text and put it in register '*' or '+'. |
| 7 | 6478 */ |
| 6479 void | |
|
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6480 clip_get_selection(Clipboard_T *cbd) |
| 7 | 6481 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6482 yankreg_T *old_y_previous, *old_y_current; |
| 7 | 6483 pos_T old_cursor; |
| 6484 pos_T old_visual; | |
| 6485 int old_visual_mode; | |
| 6486 colnr_T old_curswant; | |
| 6487 int old_set_curswant; | |
| 6488 pos_T old_op_start, old_op_end; | |
| 6489 oparg_T oa; | |
| 6490 cmdarg_T ca; | |
| 6491 | |
| 6492 if (cbd->owned) | |
| 6493 { | |
| 6494 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
| 6495 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
| 6496 return; | |
| 6497 | |
| 6498 /* Get the text between clip_star.start & clip_star.end */ | |
| 6499 old_y_previous = y_previous; | |
| 6500 old_y_current = y_current; | |
| 6501 old_cursor = curwin->w_cursor; | |
| 6502 old_curswant = curwin->w_curswant; | |
| 6503 old_set_curswant = curwin->w_set_curswant; | |
| 6504 old_op_start = curbuf->b_op_start; | |
| 6505 old_op_end = curbuf->b_op_end; | |
| 6506 old_visual = VIsual; | |
| 6507 old_visual_mode = VIsual_mode; | |
| 6508 clear_oparg(&oa); | |
| 6509 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
| 6510 oa.op_type = OP_YANK; | |
| 6511 vim_memset(&ca, 0, sizeof(ca)); | |
| 6512 ca.oap = &oa; | |
| 6513 ca.cmdchar = 'y'; | |
| 6514 ca.count1 = 1; | |
| 6515 ca.retval = CA_NO_ADJ_OP_END; | |
| 6516 do_pending_operator(&ca, 0, TRUE); | |
| 6517 y_previous = old_y_previous; | |
| 6518 y_current = old_y_current; | |
| 6519 curwin->w_cursor = old_cursor; | |
| 688 | 6520 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
| 7 | 6521 curwin->w_curswant = old_curswant; |
| 6522 curwin->w_set_curswant = old_set_curswant; | |
| 6523 curbuf->b_op_start = old_op_start; | |
| 6524 curbuf->b_op_end = old_op_end; | |
| 6525 VIsual = old_visual; | |
| 6526 VIsual_mode = old_visual_mode; | |
| 6527 } | |
|
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6528 else if (!is_clipboard_needs_update()) |
| 7 | 6529 { |
| 6530 clip_free_selection(cbd); | |
| 6531 | |
| 6532 /* Try to get selected text from another window */ | |
| 6533 clip_gen_request_selection(cbd); | |
| 6534 } | |
| 6535 } | |
| 6536 | |
| 2896 | 6537 /* |
| 6538 * Convert from the GUI selection string into the '*'/'+' register. | |
| 6539 */ | |
| 7 | 6540 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6541 clip_yank_selection( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6542 int type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6543 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6544 long len, |
|
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6545 Clipboard_T *cbd) |
| 7 | 6546 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6547 yankreg_T *y_ptr; |
| 7 | 6548 |
| 6549 if (cbd == &clip_plus) | |
| 6550 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6551 else | |
| 6552 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6553 | |
| 6554 clip_free_selection(cbd); | |
| 6555 | |
| 5798 | 6556 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
| 7 | 6557 } |
| 6558 | |
| 6559 /* | |
| 6560 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
| 6561 * with length *len. | |
| 6562 * Returns the motion type, or -1 for failure. | |
| 6563 */ | |
| 6564 int | |
|
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6565 clip_convert_selection(char_u **str, long_u *len, Clipboard_T *cbd) |
| 7 | 6566 { |
| 6567 char_u *p; | |
| 6568 int lnum; | |
| 6569 int i, j; | |
| 6570 int_u eolsize; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6571 yankreg_T *y_ptr; |
| 7 | 6572 |
| 6573 if (cbd == &clip_plus) | |
| 6574 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6575 else | |
| 6576 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6577 | |
| 6578 #ifdef USE_CRNL | |
| 6579 eolsize = 2; | |
| 6580 #else | |
| 6581 eolsize = 1; | |
| 6582 #endif | |
| 6583 | |
| 6584 *str = NULL; | |
| 6585 *len = 0; | |
| 6586 if (y_ptr->y_array == NULL) | |
| 6587 return -1; | |
| 6588 | |
| 6589 for (i = 0; i < y_ptr->y_size; i++) | |
| 6590 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
| 6591 | |
| 6592 /* | |
| 6593 * Don't want newline character at end of last line if we're in MCHAR mode. | |
| 6594 */ | |
| 6595 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
| 6596 *len -= eolsize; | |
| 6597 | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6598 p = *str = alloc(*len + 1); // add one to avoid zero |
| 7 | 6599 if (p == NULL) |
| 6600 return -1; | |
| 6601 lnum = 0; | |
| 6602 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
| 6603 { | |
| 6604 if (y_ptr->y_array[lnum][j] == '\n') | |
| 6605 p[i] = NUL; | |
| 6606 else if (y_ptr->y_array[lnum][j] == NUL) | |
| 6607 { | |
| 6608 #ifdef USE_CRNL | |
| 6609 p[i++] = '\r'; | |
| 6610 #endif | |
| 6611 p[i] = '\n'; | |
| 6612 lnum++; | |
| 6613 j = -1; | |
| 6614 } | |
| 6615 else | |
| 6616 p[i] = y_ptr->y_array[lnum][j]; | |
| 6617 } | |
| 6618 return y_ptr->y_type; | |
| 6619 } | |
| 6620 | |
| 6621 | |
| 6622 /* | |
| 6623 * If we have written to a clipboard register, send the text to the clipboard. | |
| 6624 */ | |
| 6625 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6626 may_set_selection(void) |
| 7 | 6627 { |
| 6628 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
| 6629 { | |
| 6630 clip_own_selection(&clip_star); | |
| 6631 clip_gen_set_selection(&clip_star); | |
| 6632 } | |
| 6633 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
| 6634 { | |
| 6635 clip_own_selection(&clip_plus); | |
| 6636 clip_gen_set_selection(&clip_plus); | |
| 6637 } | |
| 6638 } | |
| 6639 | |
| 6640 #endif /* FEAT_CLIPBOARD || PROTO */ | |
| 6641 | |
| 6642 | |
| 6643 #if defined(FEAT_DND) || defined(PROTO) | |
| 6644 /* | |
| 6645 * Replace the contents of the '~' register with str. | |
| 6646 */ | |
| 6647 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6648 dnd_yank_drag_data(char_u *str, long len) |
| 7 | 6649 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6650 yankreg_T *curr; |
| 7 | 6651 |
| 6652 curr = y_current; | |
| 6653 y_current = &y_regs[TILDE_REGISTER]; | |
| 6654 free_yank_all(); | |
| 5798 | 6655 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
| 7 | 6656 y_current = curr; |
| 6657 } | |
| 6658 #endif | |
| 6659 | |
| 6660 | |
| 6661 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 6662 /* | |
| 6663 * Return the type of a register. | |
| 6664 * Used for getregtype() | |
| 6665 * Returns MAUTO for error. | |
| 6666 */ | |
| 6667 char_u | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6668 get_reg_type(int regname, long *reglen) |
| 7 | 6669 { |
| 6670 switch (regname) | |
| 6671 { | |
| 6672 case '%': /* file name */ | |
| 6673 case '#': /* alternate file name */ | |
| 6674 case '=': /* expression */ | |
| 6675 case ':': /* last command line */ | |
| 6676 case '/': /* last search-pattern */ | |
| 6677 case '.': /* last inserted text */ | |
| 6678 #ifdef FEAT_SEARCHPATH | |
| 6679 case Ctrl_F: /* Filename under cursor */ | |
| 6680 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 6681 #endif | |
| 6682 case Ctrl_W: /* word under cursor */ | |
| 6683 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 6684 case '_': /* black hole: always empty */ | |
| 6685 return MCHAR; | |
| 6686 } | |
| 6687 | |
| 6688 #ifdef FEAT_CLIPBOARD | |
| 6689 regname = may_get_selection(regname); | |
| 6690 #endif | |
| 6691 | |
| 5596 | 6692 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
|
6693 return MAUTO; |
| 5596 | 6694 |
| 7 | 6695 get_yank_register(regname, FALSE); |
| 6696 | |
| 6697 if (y_current->y_array != NULL) | |
| 6698 { | |
| 6699 if (reglen != NULL && y_current->y_type == MBLOCK) | |
| 6700 *reglen = y_current->y_width; | |
| 6701 return y_current->y_type; | |
| 6702 } | |
| 6703 return MAUTO; | |
| 6704 } | |
| 6705 | |
| 5796 | 6706 /* |
| 6707 * When "flags" has GREG_LIST return a list with text "s". | |
| 6708 * Otherwise just return "s". | |
| 6709 */ | |
| 6710 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6711 getreg_wrap_one_line(char_u *s, int flags) |
| 5796 | 6712 { |
| 6713 if (flags & GREG_LIST) | |
| 6714 { | |
| 6715 list_T *list = list_alloc(); | |
| 6716 | |
| 6717 if (list != NULL) | |
| 6718 { | |
| 6719 if (list_append_string(list, NULL, -1) == FAIL) | |
| 6720 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6721 list_free(list); |
| 5796 | 6722 return NULL; |
| 6723 } | |
| 6724 list->lv_first->li_tv.vval.v_string = s; | |
| 6725 } | |
| 6726 return (char_u *)list; | |
| 6727 } | |
| 6728 return s; | |
| 6729 } | |
| 6730 | |
| 7 | 6731 /* |
| 6732 * Return the contents of a register as a single allocated string. | |
| 6733 * Used for "@r" in expressions and for getreg(). | |
| 6734 * Returns NULL for error. | |
| 5796 | 6735 * Flags: |
| 6736 * GREG_NO_EXPR Do not allow expression register | |
| 6737 * GREG_EXPR_SRC For the expression register: return expression itself, | |
| 6738 * not the result of its evaluation. | |
| 6739 * GREG_LIST Return a list of lines in place of a single string. | |
| 7 | 6740 */ |
| 6741 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6742 get_reg_contents(int regname, int flags) |
| 7 | 6743 { |
| 6744 long i; | |
| 6745 char_u *retval; | |
| 6746 int allocated; | |
| 6747 long len; | |
| 6748 | |
| 6749 /* Don't allow using an expression register inside an expression */ | |
| 6750 if (regname == '=') | |
| 6751 { | |
| 5796 | 6752 if (flags & GREG_NO_EXPR) |
| 6753 return NULL; | |
| 6754 if (flags & GREG_EXPR_SRC) | |
| 6755 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
| 6756 return getreg_wrap_one_line(get_expr_line(), flags); | |
| 7 | 6757 } |
| 6758 | |
| 6759 if (regname == '@') /* "@@" is used for unnamed register */ | |
| 6760 regname = '"'; | |
| 6761 | |
| 6762 /* check for valid regname */ | |
| 6763 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 6764 return NULL; | |
| 6765 | |
| 6766 #ifdef FEAT_CLIPBOARD | |
| 6767 regname = may_get_selection(regname); | |
| 6768 #endif | |
| 6769 | |
| 6770 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
| 6771 { | |
| 6772 if (retval == NULL) | |
| 6773 return NULL; | |
| 5796 | 6774 if (allocated) |
| 6775 return getreg_wrap_one_line(retval, flags); | |
| 6776 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
| 7 | 6777 } |
| 6778 | |
| 6779 get_yank_register(regname, FALSE); | |
| 6780 if (y_current->y_array == NULL) | |
| 6781 return NULL; | |
| 6782 | |
| 5796 | 6783 if (flags & GREG_LIST) |
| 6784 { | |
| 6785 list_T *list = list_alloc(); | |
| 6786 int error = FALSE; | |
| 6787 | |
| 6788 if (list == NULL) | |
| 6789 return NULL; | |
| 6790 for (i = 0; i < y_current->y_size; ++i) | |
| 6791 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
| 6792 error = TRUE; | |
| 6793 if (error) | |
| 6794 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6795 list_free(list); |
| 5796 | 6796 return NULL; |
| 6797 } | |
| 6798 return (char_u *)list; | |
| 6799 } | |
| 6800 | |
| 7 | 6801 /* |
| 6802 * Compute length of resulting string. | |
| 6803 */ | |
| 6804 len = 0; | |
| 6805 for (i = 0; i < y_current->y_size; ++i) | |
| 6806 { | |
| 6807 len += (long)STRLEN(y_current->y_array[i]); | |
| 6808 /* | |
| 6809 * Insert a newline between lines and after last line if | |
| 6810 * y_type is MLINE. | |
| 6811 */ | |
| 6812 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6813 ++len; | |
| 6814 } | |
| 6815 | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6816 retval = alloc(len + 1); |
| 7 | 6817 |
| 6818 /* | |
| 6819 * Copy the lines of the yank register into the string. | |
| 6820 */ | |
| 6821 if (retval != NULL) | |
| 6822 { | |
| 6823 len = 0; | |
| 6824 for (i = 0; i < y_current->y_size; ++i) | |
| 6825 { | |
| 6826 STRCPY(retval + len, y_current->y_array[i]); | |
| 6827 len += (long)STRLEN(retval + len); | |
| 6828 | |
| 6829 /* | |
| 6830 * Insert a NL between lines and after the last line if y_type is | |
| 6831 * MLINE. | |
| 6832 */ | |
| 6833 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6834 retval[len++] = '\n'; | |
| 6835 } | |
| 6836 retval[len] = NUL; | |
| 6837 } | |
| 6838 | |
| 6839 return retval; | |
| 6840 } | |
| 6841 | |
| 5798 | 6842 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6843 init_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6844 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6845 yankreg_T **old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6846 yankreg_T **old_y_current, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6847 int must_append, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6848 int *yank_type UNUSED) |
| 5798 | 6849 { |
| 6850 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
| 6851 { | |
| 6852 emsg_invreg(name); | |
| 6853 return FAIL; | |
| 6854 } | |
| 6855 | |
| 6856 /* Don't want to change the current (unnamed) register */ | |
| 6857 *old_y_previous = y_previous; | |
| 6858 *old_y_current = y_current; | |
| 6859 | |
| 6860 get_yank_register(name, TRUE); | |
| 6861 if (!y_append && !must_append) | |
| 6862 free_yank_all(); | |
| 6863 return OK; | |
| 6864 } | |
| 6865 | |
| 6866 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6867 finish_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6868 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6869 yankreg_T *old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6870 yankreg_T *old_y_current) |
| 5798 | 6871 { |
| 6872 # ifdef FEAT_CLIPBOARD | |
| 6873 /* Send text of clipboard register to the clipboard. */ | |
| 6874 may_set_selection(); | |
| 6875 # endif | |
| 6876 | |
| 6877 /* ':let @" = "val"' should change the meaning of the "" register */ | |
| 6878 if (name != '"') | |
| 6879 y_previous = old_y_previous; | |
| 6880 y_current = old_y_current; | |
| 6881 } | |
| 6882 | |
| 7 | 6883 /* |
| 6884 * Store string "str" in register "name". | |
| 6885 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
| 6886 * If "must_append" is TRUE, always append to the register. Otherwise append | |
| 6887 * if "name" is an uppercase letter. | |
| 6888 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
| 6889 * Careful: 'str' is modified, you may have to use a copy! | |
| 6890 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
| 6891 */ | |
| 6892 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6893 write_reg_contents( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6894 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6895 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6896 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6897 int must_append) |
| 7 | 6898 { |
| 6899 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
| 6900 } | |
| 6901 | |
| 6902 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6903 write_reg_contents_lst( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6904 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6905 char_u **strings, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6906 int maxlen UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6907 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6908 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6909 long block_len) |
| 5798 | 6910 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6911 yankreg_T *old_y_previous, *old_y_current; |
| 5798 | 6912 |
| 6913 if (name == '/' | |
| 6914 #ifdef FEAT_EVAL | |
| 6915 || name == '=' | |
| 6916 #endif | |
| 6917 ) | |
| 6918 { | |
| 6919 char_u *s; | |
| 6920 | |
| 6921 if (strings[0] == NULL) | |
| 6922 s = (char_u *)""; | |
| 6923 else if (strings[1] != NULL) | |
| 6924 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6925 emsg(_("E883: search pattern and expression register may not " |
| 5798 | 6926 "contain two or more lines")); |
| 6927 return; | |
| 6928 } | |
| 6929 else | |
| 6930 s = strings[0]; | |
| 6931 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
| 6932 return; | |
| 6933 } | |
| 6934 | |
| 6935 if (name == '_') /* black hole: nothing to do */ | |
| 6936 return; | |
| 6937 | |
| 6938 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
| 6939 &yank_type) == FAIL) | |
| 6940 return; | |
| 6941 | |
| 6942 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
| 6943 | |
| 6944 finish_write_reg(name, old_y_previous, old_y_current); | |
| 6945 } | |
| 6946 | |
| 6947 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6948 write_reg_contents_ex( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6949 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6950 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6951 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6952 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6953 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6954 long block_len) |
| 7 | 6955 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6956 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
|
6957 long len; |
| 7 | 6958 |
| 336 | 6959 if (maxlen >= 0) |
| 6960 len = maxlen; | |
| 6961 else | |
| 6962 len = (long)STRLEN(str); | |
| 6963 | |
| 7 | 6964 /* Special case: '/' search pattern */ |
| 6965 if (name == '/') | |
| 6966 { | |
| 6967 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
| 6968 return; | |
| 6969 } | |
| 6970 | |
| 6557 | 6971 if (name == '#') |
| 6972 { | |
| 6973 buf_T *buf; | |
| 6974 | |
| 6975 if (VIM_ISDIGIT(*str)) | |
| 6976 { | |
| 6977 int num = atoi((char *)str); | |
| 6978 | |
| 6979 buf = buflist_findnr(num); | |
| 6980 if (buf == NULL) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6981 semsg(_(e_nobufnr), (long)num); |
| 6557 | 6982 } |
| 6983 else | |
| 6984 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
| 6985 TRUE, FALSE, FALSE)); | |
| 6986 if (buf == NULL) | |
| 6987 return; | |
| 6988 curwin->w_alt_fnum = buf->b_fnum; | |
| 6989 return; | |
| 6990 } | |
| 6991 | |
| 336 | 6992 #ifdef FEAT_EVAL |
| 6993 if (name == '=') | |
| 6994 { | |
| 6995 char_u *p, *s; | |
| 6996 | |
| 6997 p = vim_strnsave(str, (int)len); | |
| 6998 if (p == NULL) | |
| 6999 return; | |
| 7000 if (must_append) | |
| 7001 { | |
| 7002 s = concat_str(get_expr_line_src(), p); | |
| 7003 vim_free(p); | |
| 7004 p = s; | |
| 7005 } | |
| 7006 set_expr_line(p); | |
| 7007 return; | |
| 7008 } | |
| 7009 #endif | |
| 7010 | |
| 7 | 7011 if (name == '_') /* black hole: nothing to do */ |
| 7012 return; | |
| 7013 | |
| 5798 | 7014 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
| 7015 &yank_type) == FAIL) | |
| 7016 return; | |
| 7017 | |
| 7018 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
| 7019 | |
| 7020 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7 | 7021 } |
| 7022 #endif /* FEAT_EVAL */ | |
| 7023 | |
| 7024 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
| 7025 /* | |
| 7026 * Put a string into a register. When the register is not empty, the string | |
| 7027 * is appended. | |
| 7028 */ | |
| 7029 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7030 str_to_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7031 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
|
7032 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
|
7033 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
|
7034 long len, /* length of string */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7035 long blocklen, /* width of Visual block */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7036 int str_list) /* TRUE if str is char_u ** */ |
| 7 | 7037 { |
| 2896 | 7038 int type; /* MCHAR, MLINE or MBLOCK */ |
| 7 | 7039 int lnum; |
| 7040 long start; | |
| 7041 long i; | |
| 7042 int extra; | |
| 7043 int newlines; /* number of lines added */ | |
| 7044 int extraline = 0; /* extra line at the end */ | |
| 7045 int append = FALSE; /* append to last line in register */ | |
| 7046 char_u *s; | |
| 5798 | 7047 char_u **ss; |
| 7 | 7048 char_u **pp; |
| 7049 long maxlen; | |
| 7050 | |
| 2000 | 7051 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
| 7 | 7052 y_ptr->y_size = 0; |
| 7053 | |
| 2896 | 7054 if (yank_type == MAUTO) |
| 5798 | 7055 type = ((str_list || (len > 0 && (str[len - 1] == NL |
| 7056 || str[len - 1] == CAR))) | |
| 2896 | 7057 ? MLINE : MCHAR); |
| 7058 else | |
| 7059 type = yank_type; | |
| 7060 | |
| 7 | 7061 /* |
| 7062 * Count the number of lines within the string | |
| 7063 */ | |
| 7064 newlines = 0; | |
| 5798 | 7065 if (str_list) |
| 7066 { | |
| 7067 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
| 7 | 7068 ++newlines; |
| 5798 | 7069 } |
| 7070 else | |
| 7071 { | |
| 7072 for (i = 0; i < len; i++) | |
| 7073 if (str[i] == '\n') | |
| 7074 ++newlines; | |
| 7075 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
| 7076 { | |
| 7077 extraline = 1; | |
| 7078 ++newlines; /* count extra newline at the end */ | |
| 7079 } | |
| 7080 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
| 7081 { | |
| 7082 append = TRUE; | |
| 7083 --newlines; /* uncount newline when appending first line */ | |
| 7084 } | |
| 7 | 7085 } |
| 7086 | |
| 6807 | 7087 /* Without any lines make the register empty. */ |
| 7088 if (y_ptr->y_size + newlines == 0) | |
| 7089 { | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7090 VIM_CLEAR(y_ptr->y_array); |
| 6807 | 7091 return; |
| 7092 } | |
| 7093 | |
| 7 | 7094 /* |
| 7095 * Allocate an array to hold the pointers to the new register lines. | |
| 7096 * If the register was not empty, move the existing lines to the new array. | |
| 7097 */ | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
7098 pp = lalloc_clear((y_ptr->y_size + newlines) * sizeof(char_u *), TRUE); |
| 7 | 7099 if (pp == NULL) /* out of memory */ |
| 7100 return; | |
| 7101 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
| 7102 pp[lnum] = y_ptr->y_array[lnum]; | |
| 7103 vim_free(y_ptr->y_array); | |
| 7104 y_ptr->y_array = pp; | |
| 7105 maxlen = 0; | |
| 7106 | |
| 7107 /* | |
| 7108 * Find the end of each line and save it into the array. | |
| 7109 */ | |
| 5798 | 7110 if (str_list) |
| 7111 { | |
| 7112 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
| 7 | 7113 { |
| 5856 | 7114 i = (long)STRLEN(*ss); |
| 5798 | 7115 pp[lnum] = vim_strnsave(*ss, i); |
| 7116 if (i > maxlen) | |
| 7117 maxlen = i; | |
| 7 | 7118 } |
| 5798 | 7119 } |
| 7120 else | |
| 7121 { | |
| 7122 for (start = 0; start < len + extraline; start += i + 1) | |
| 7 | 7123 { |
| 5798 | 7124 for (i = start; i < len; ++i) /* find the end of the line */ |
| 7125 if (str[i] == '\n') | |
| 7126 break; | |
| 7127 i -= start; /* i is now length of line */ | |
| 7128 if (i > maxlen) | |
| 7129 maxlen = i; | |
| 7130 if (append) | |
| 7131 { | |
| 7132 --lnum; | |
| 7133 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
| 7134 } | |
| 7135 else | |
| 7136 extra = 0; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
7137 s = alloc(i + extra + 1); |
| 5798 | 7138 if (s == NULL) |
| 7139 break; | |
| 7140 if (extra) | |
| 7141 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
| 7142 if (append) | |
| 7143 vim_free(y_ptr->y_array[lnum]); | |
| 7144 if (i) | |
| 7145 mch_memmove(s + extra, str + start, (size_t)i); | |
| 7146 extra += i; | |
| 7147 s[extra] = NUL; | |
| 7148 y_ptr->y_array[lnum++] = s; | |
| 7149 while (--extra >= 0) | |
| 7150 { | |
| 7151 if (*s == NUL) | |
| 7152 *s = '\n'; /* replace NUL with newline */ | |
| 7153 ++s; | |
| 7154 } | |
| 7155 append = FALSE; /* only first line is appended */ | |
| 7 | 7156 } |
| 7157 } | |
| 7158 y_ptr->y_type = type; | |
| 7159 y_ptr->y_size = lnum; | |
| 7160 if (type == MBLOCK) | |
| 7161 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
| 7162 else | |
| 7163 y_ptr->y_width = 0; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7164 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7165 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
|
7166 #endif |
| 7 | 7167 } |
| 7168 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
| 7169 | |
| 7170 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7171 clear_oparg(oparg_T *oap) |
| 7 | 7172 { |
| 7173 vim_memset(oap, 0, sizeof(oparg_T)); | |
| 7174 } | |
| 7175 | |
| 7176 /* | |
| 161 | 7177 * Count the number of bytes, characters and "words" in a line. |
| 7 | 7178 * |
| 7179 * "Words" are counted by looking for boundaries between non-space and | |
| 7180 * space characters. (it seems to produce results that match 'wc'.) | |
| 7181 * | |
| 161 | 7182 * Return value is byte count; word count for the line is added to "*wc". |
| 7183 * Char count is added to "*cc". | |
| 7 | 7184 * |
| 7185 * The function will only examine the first "limit" characters in the | |
| 7186 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
| 7187 * case, eol_size will be added to the character count to account for | |
| 7188 * the size of the EOL character. | |
| 7189 */ | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7190 static varnumber_T |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7191 line_count_info( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7192 char_u *line, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7193 varnumber_T *wc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7194 varnumber_T *cc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7195 varnumber_T limit, |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7196 int eol_size) |
| 7 | 7197 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7198 varnumber_T i; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7199 varnumber_T words = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7200 varnumber_T chars = 0; |
| 7 | 7201 int is_word = 0; |
| 7202 | |
| 3626 | 7203 for (i = 0; i < limit && line[i] != NUL; ) |
| 7 | 7204 { |
| 7205 if (is_word) | |
| 7206 { | |
| 7207 if (vim_isspace(line[i])) | |
| 7208 { | |
| 7209 words++; | |
| 7210 is_word = 0; | |
| 7211 } | |
| 7212 } | |
| 7213 else if (!vim_isspace(line[i])) | |
| 7214 is_word = 1; | |
| 161 | 7215 ++chars; |
| 474 | 7216 i += (*mb_ptr2len)(line + i); |
| 7 | 7217 } |
| 7218 | |
| 7219 if (is_word) | |
| 7220 words++; | |
| 7221 *wc += words; | |
| 7222 | |
| 7223 /* Add eol_size if the end of line was reached before hitting limit. */ | |
| 2996 | 7224 if (i < limit && line[i] == NUL) |
| 161 | 7225 { |
| 7 | 7226 i += eol_size; |
| 161 | 7227 chars += eol_size; |
| 7228 } | |
| 7229 *cc += chars; | |
| 7 | 7230 return i; |
| 7231 } | |
| 7232 | |
| 7233 /* | |
| 7234 * Give some info about the position of the cursor (for "g CTRL-G"). | |
| 7235 * In Visual mode, give some info about the selected region. (In this case, | |
| 7236 * 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
|
7237 * When "dict" is not NULL store the info there instead of showing it. |
| 7 | 7238 */ |
| 7239 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7240 cursor_pos_info(dict_T *dict) |
| 7 | 7241 { |
| 7242 char_u *p; | |
| 274 | 7243 char_u buf1[50]; |
| 7244 char_u buf2[40]; | |
| 7 | 7245 linenr_T lnum; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7246 varnumber_T byte_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7247 varnumber_T bom_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7248 varnumber_T byte_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7249 varnumber_T char_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7250 varnumber_T char_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7251 varnumber_T word_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7252 varnumber_T word_count_cursor = 0; |
| 7 | 7253 int eol_size; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7254 varnumber_T last_check = 100000L; |
| 7 | 7255 long line_count_selected = 0; |
| 7256 pos_T min_pos, max_pos; | |
| 7257 oparg_T oparg; | |
| 7258 struct block_def bd; | |
| 7259 | |
| 7260 /* | |
| 7261 * Compute the length of the file in characters. | |
| 7262 */ | |
| 7263 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 7264 { | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7265 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7266 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
7267 msg(_(no_lines_msg)); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7268 return; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7269 } |
| 7 | 7270 } |
| 7271 else | |
| 7272 { | |
| 7273 if (get_fileformat(curbuf) == EOL_DOS) | |
| 7274 eol_size = 2; | |
| 7275 else | |
| 7276 eol_size = 1; | |
| 7277 | |
| 7278 if (VIsual_active) | |
| 7279 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7280 if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 7281 { |
| 7282 min_pos = VIsual; | |
| 7283 max_pos = curwin->w_cursor; | |
| 7284 } | |
| 7285 else | |
| 7286 { | |
| 7287 min_pos = curwin->w_cursor; | |
| 7288 max_pos = VIsual; | |
| 7289 } | |
| 7290 if (*p_sel == 'e' && max_pos.col > 0) | |
| 7291 --max_pos.col; | |
| 7292 | |
| 7293 if (VIsual_mode == Ctrl_V) | |
| 7294 { | |
| 1866 | 7295 #ifdef FEAT_LINEBREAK |
| 7296 char_u * saved_sbr = p_sbr; | |
| 7297 | |
| 7298 /* Make 'sbr' empty for a moment to get the correct size. */ | |
| 7299 p_sbr = empty_option; | |
| 7300 #endif | |
| 7 | 7301 oparg.is_VIsual = 1; |
| 7302 oparg.block_mode = TRUE; | |
| 7303 oparg.op_type = OP_NOP; | |
| 7304 getvcols(curwin, &min_pos, &max_pos, | |
| 688 | 7305 &oparg.start_vcol, &oparg.end_vcol); |
| 1866 | 7306 #ifdef FEAT_LINEBREAK |
| 7307 p_sbr = saved_sbr; | |
| 7308 #endif | |
| 688 | 7309 if (curwin->w_curswant == MAXCOL) |
| 7310 oparg.end_vcol = MAXCOL; | |
| 7 | 7311 /* Swap the start, end vcol if needed */ |
| 7312 if (oparg.end_vcol < oparg.start_vcol) | |
| 7313 { | |
| 7314 oparg.end_vcol += oparg.start_vcol; | |
| 7315 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
| 7316 oparg.end_vcol -= oparg.start_vcol; | |
| 7317 } | |
| 7318 } | |
| 7319 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
| 7320 } | |
| 7321 | |
| 7322 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
| 7323 { | |
| 7324 /* Check for a CTRL-C every 100000 characters. */ | |
| 161 | 7325 if (byte_count > last_check) |
| 7 | 7326 { |
| 7327 ui_breakcheck(); | |
| 7328 if (got_int) | |
| 7329 return; | |
| 161 | 7330 last_check = byte_count + 100000L; |
| 7 | 7331 } |
| 7332 | |
| 7333 /* Do extra processing for VIsual mode. */ | |
| 7334 if (VIsual_active | |
| 7335 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
| 7336 { | |
| 45 | 7337 char_u *s = NULL; |
| 7338 long len = 0L; | |
| 7339 | |
| 7 | 7340 switch (VIsual_mode) |
| 7341 { | |
| 7342 case Ctrl_V: | |
| 7343 virtual_op = virtual_active(); | |
| 7344 block_prep(&oparg, &bd, lnum, 0); | |
| 7345 virtual_op = MAYBE; | |
| 45 | 7346 s = bd.textstart; |
| 7347 len = (long)bd.textlen; | |
| 7 | 7348 break; |
| 7349 case 'V': | |
| 45 | 7350 s = ml_get(lnum); |
| 7351 len = MAXCOL; | |
| 7 | 7352 break; |
| 7353 case 'v': | |
| 7354 { | |
| 7355 colnr_T start_col = (lnum == min_pos.lnum) | |
| 7356 ? min_pos.col : 0; | |
| 7357 colnr_T end_col = (lnum == max_pos.lnum) | |
| 7358 ? max_pos.col - start_col + 1 : MAXCOL; | |
| 7359 | |
| 45 | 7360 s = ml_get(lnum) + start_col; |
| 7361 len = end_col; | |
| 7 | 7362 } |
| 7363 break; | |
| 7364 } | |
| 45 | 7365 if (s != NULL) |
| 7366 { | |
| 161 | 7367 byte_count_cursor += line_count_info(s, &word_count_cursor, |
| 7368 &char_count_cursor, len, eol_size); | |
| 45 | 7369 if (lnum == curbuf->b_ml.ml_line_count |
| 7370 && !curbuf->b_p_eol | |
| 6933 | 7371 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
| 50 | 7372 && (long)STRLEN(s) < len) |
| 161 | 7373 byte_count_cursor -= eol_size; |
| 45 | 7374 } |
| 7 | 7375 } |
| 7376 else | |
| 7377 { | |
| 7378 /* In non-visual mode, check for the line the cursor is on */ | |
| 7379 if (lnum == curwin->w_cursor.lnum) | |
| 7380 { | |
| 7381 word_count_cursor += word_count; | |
| 161 | 7382 char_count_cursor += char_count; |
| 7383 byte_count_cursor = byte_count + | |
| 7384 line_count_info(ml_get(lnum), | |
| 7385 &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
|
7386 (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
|
7387 eol_size); |
| 7 | 7388 } |
| 7389 } | |
| 7390 /* Add to the running totals */ | |
| 161 | 7391 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
|
7392 &char_count, (varnumber_T)MAXCOL, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7393 eol_size); |
| 7 | 7394 } |
| 7395 | |
| 7396 /* Correction for when last line doesn't have an EOL. */ | |
| 6933 | 7397 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
| 161 | 7398 byte_count -= eol_size; |
| 7 | 7399 |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7400 if (dict == NULL) |
| 7 | 7401 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7402 if (VIsual_active) |
| 7 | 7403 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7404 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
|
7405 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7406 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
|
7407 &max_pos.col); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7408 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
|
7409 (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
|
7410 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7411 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7412 buf1[0] = NUL; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7413 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7414 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
|
7415 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7416 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7417 _("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
|
7418 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7419 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7420 (long_long_T)word_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7421 (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7422 (long_long_T)byte_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7423 (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7424 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7425 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7426 _("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
|
7427 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7428 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7429 (long_long_T)word_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7430 (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7431 (long_long_T)char_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7432 (long_long_T)char_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7433 (long_long_T)byte_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7434 (long_long_T)byte_count); |
| 7 | 7435 } |
| 7436 else | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7437 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7438 p = ml_get_curline(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7439 validate_virtcol(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7440 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
|
7441 (int)curwin->w_virtcol + 1); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7442 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
|
7443 linetabsize(p)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7444 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7445 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
|
7446 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7447 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7448 _("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
|
7449 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7450 (long)curwin->w_cursor.lnum, |
| 7 | 7451 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7452 (long_long_T)word_count_cursor, (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7453 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7454 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7455 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7456 _("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
|
7457 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7458 (long)curwin->w_cursor.lnum, |
| 161 | 7459 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7460 (long_long_T)word_count_cursor, (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7461 (long_long_T)char_count_cursor, (long_long_T)char_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7462 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7463 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7464 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7465 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7466 bom_count = bomb_size(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7467 if (bom_count > 0) |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7468 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7469 _("(+%lld for BOM)"), (long_long_T)bom_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7470 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7471 { |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7472 /* 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
|
7473 p = p_shm; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7474 p_shm = (char_u *)""; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
7475 msg((char *)IObuff); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7476 p_shm = p; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7477 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7478 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7479 #if defined(FEAT_EVAL) |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7480 if (dict != NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7481 { |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7482 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
|
7483 dict_add_number(dict, "chars", char_count); |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7484 dict_add_number(dict, "bytes", byte_count + bom_count); |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7485 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
|
7486 byte_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7487 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
|
7488 char_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7489 dict_add_number(dict, 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
|
7490 word_count_cursor); |
| 7 | 7491 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7492 #endif |
| 7 | 7493 } |