Mercurial > vim
annotate src/ops.c @ 14497:a7b2dc5f1306 v8.1.0262
patch 8.1.0262: not enough testing for getftype()
commit https://github.com/vim/vim/commit/1598f9937a18c056d7b713dc254325c8f8456c8f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 9 22:08:57 2018 +0200
patch 8.1.0262: not enough testing for getftype()
Problem: Not enough testing for getftype().
Solution: Add a test. (Dominique Pelle, closes https://github.com/vim/vim/issues/3300)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 09 Aug 2018 22:15:04 +0200 |
| parents | 0a69e6e708f9 |
| children | c8f07e8b273e |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
| 12 * op_change, op_yank, do_put, do_join | |
| 13 */ | |
| 14 | |
| 15 #include "vim.h" | |
| 16 | |
| 17 /* | |
| 18 * Number of registers. | |
| 19 * 0 = unnamed register, for normal yanks and puts | |
| 20 * 1..9 = registers '1' to '9', for deletes | |
| 21 * 10..35 = registers 'a' to 'z' | |
| 22 * 36 = delete register '-' | |
| 23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
| 24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
| 25 */ | |
| 26 /* | |
| 27 * Symbolic names for some registers. | |
| 28 */ | |
| 29 #define DELETION_REGISTER 36 | |
| 30 #ifdef FEAT_CLIPBOARD | |
| 31 # define STAR_REGISTER 37 | |
| 32 # ifdef FEAT_X11 | |
| 33 # define PLUS_REGISTER 38 | |
| 34 # else | |
| 35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
| 36 # endif | |
| 37 #endif | |
| 38 #ifdef FEAT_DND | |
| 39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
| 40 #endif | |
| 41 | |
| 42 #ifdef FEAT_CLIPBOARD | |
| 43 # ifdef FEAT_DND | |
| 44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
| 45 # else | |
| 46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
| 47 # endif | |
| 48 #else | |
| 49 # define NUM_REGISTERS 37 | |
| 50 #endif | |
| 51 | |
| 52 /* | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
| 7 | 54 */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
| 7 | 56 { |
| 57 char_u **y_array; /* pointer to array of line pointers */ | |
| 58 linenr_T y_size; /* number of lines in y_array */ | |
| 59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
| 60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
| 7 | 69 static int y_append; /* TRUE when appending */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
| 7 | 71 |
| 72 /* | |
| 73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
| 74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
| 75 */ | |
| 76 struct block_def | |
| 77 { | |
| 1839 | 78 int startspaces; /* 'extra' cols before first char */ |
| 79 int endspaces; /* 'extra' cols after last char */ | |
| 7 | 80 int textlen; /* chars in block */ |
| 1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
| 82 colnr_T textcol; /* index of chars (partially) in block */ | |
| 7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
| 84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
| 85 #ifdef FEAT_VISUALEXTRA | |
| 86 int is_short; /* TRUE if line is too short to fit in block */ | |
| 87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
| 88 int is_oneChar; /* TRUE if block within one character */ | |
| 89 int pre_whitesp; /* screen cols of ws before block */ | |
| 90 int pre_whitesp_c; /* chars of ws before block */ | |
| 91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
| 92 #endif | |
| 93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
| 94 }; | |
| 95 | |
| 96 #ifdef FEAT_VISUALEXTRA | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static int stuff_yank(int, char_u *); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void put_reedit_in_typebuf(int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int put_in_typebuf(char_u *s, int esc, int colon, |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static void stuffescaped(char_u *arg, int literally); |
| 7 | 105 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 static void mb_adjust_opend(oparg_T *oap); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void free_yank(long); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static void free_yank_all(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
110 static int yank_copy_line(struct block_def *bd, long y_idx); |
| 7 | 111 #ifdef FEAT_CLIPBOARD |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
112 static void copy_yank_reg(yankreg_T *reg); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static void may_set_selection(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
114 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static void dis_msg(char_u *p, int skip_esc); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
116 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
|
117 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
| 7 | 118 #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
|
119 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
|
120 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
121 static int ends_in_white(linenr_T lnum); |
| 7 | 122 #ifdef FEAT_COMMENTS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 static int same_leader(linenr_T lnum, int, char_u *, int, char_u *); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
124 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
| 7 | 125 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int fmt_check_par(linenr_T); |
| 7 | 127 #endif |
| 128 | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
129 // 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
|
130 #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
|
131 #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
|
132 |
| 7 | 133 /* |
| 134 * The names of operators. | |
| 135 * 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
|
136 * The third field holds OPF_ flags. |
| 7 | 137 */ |
| 138 static char opchars[][3] = | |
| 139 { | |
|
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
|
140 {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
|
141 {'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
|
142 {'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
|
143 {'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
|
144 {'<', 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
|
145 {'>', 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
|
146 {'!', 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
|
147 {'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
|
148 {'=', 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
|
149 {'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
|
150 {':', 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
|
151 {'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
|
152 {'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
|
153 {'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
|
154 {'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
|
155 {'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
|
156 {'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
|
157 {'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
|
158 {'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
|
159 {'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
|
160 {'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
|
161 {'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
|
162 {'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
|
163 {'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
|
164 {'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
|
165 {'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
|
166 {'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
|
167 {'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
|
168 {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
|
169 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
| 7 | 170 }; |
| 171 | |
| 172 /* | |
| 173 * Translate a command name into an operator type. | |
| 174 * Must only be called with a valid operator name! | |
| 175 */ | |
| 176 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
177 get_op_type(int char1, int char2) |
| 7 | 178 { |
| 179 int i; | |
| 180 | |
| 181 if (char1 == 'r') /* ignore second character */ | |
| 182 return OP_REPLACE; | |
| 183 if (char1 == '~') /* when tilde is an operator */ | |
| 184 return OP_TILDE; | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
185 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
|
186 return OP_NR_ADD; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
187 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
|
188 return OP_NR_SUB; |
| 7 | 189 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
|
190 { |
| 7 | 191 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
| 192 break; | |
|
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
193 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
|
194 { |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
195 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
|
196 break; |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
197 } |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
198 } |
| 7 | 199 return i; |
| 200 } | |
| 201 | |
| 202 /* | |
| 203 * Return TRUE if operator "op" always works on whole lines. | |
| 204 */ | |
| 205 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
206 op_on_lines(int op) |
| 7 | 207 { |
|
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
|
208 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
|
209 } |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
210 |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
211 /* |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
212 * 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
|
213 */ |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
214 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
|
215 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
|
216 { |
|
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
|
217 return opchars[op][2] & OPF_CHANGE; |
| 7 | 218 } |
| 219 | |
| 220 /* | |
| 221 * Get first operator command character. | |
| 222 * Returns 'g' or 'z' if there is another command character. | |
| 223 */ | |
| 224 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
225 get_op_char(int optype) |
| 7 | 226 { |
| 227 return opchars[optype][0]; | |
| 228 } | |
| 229 | |
| 230 /* | |
| 231 * Get second operator command character. | |
| 232 */ | |
| 233 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
234 get_extra_op_char(int optype) |
| 7 | 235 { |
| 236 return opchars[optype][1]; | |
| 237 } | |
| 238 | |
| 239 /* | |
| 240 * op_shift - handle a shift operation | |
| 241 */ | |
| 242 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
243 op_shift(oparg_T *oap, int curs_top, int amount) |
| 7 | 244 { |
| 245 long i; | |
| 246 int first_char; | |
| 247 char_u *s; | |
| 248 int block_col = 0; | |
| 249 | |
| 250 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 251 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 252 return; | |
| 253 | |
| 254 if (oap->block_mode) | |
| 255 block_col = curwin->w_cursor.col; | |
| 256 | |
| 257 for (i = oap->line_count; --i >= 0; ) | |
| 258 { | |
| 259 first_char = *ml_get_curline(); | |
| 260 if (first_char == NUL) /* empty line */ | |
| 261 curwin->w_cursor.col = 0; | |
| 262 #ifdef FEAT_VISUALEXTRA | |
| 263 else if (oap->block_mode) | |
| 264 shift_block(oap, amount); | |
| 265 #endif | |
| 266 else | |
| 267 /* Move the line right if it doesn't start with '#', 'smartindent' | |
| 268 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
| 269 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 270 if (first_char != '#' || !preprocs_left()) | |
| 271 #endif | |
| 272 { | |
| 1516 | 273 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
| 7 | 274 } |
| 275 ++curwin->w_cursor.lnum; | |
| 276 } | |
| 277 | |
| 278 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 279 if (oap->block_mode) | |
| 280 { | |
| 281 curwin->w_cursor.lnum = oap->start.lnum; | |
| 282 curwin->w_cursor.col = block_col; | |
| 283 } | |
| 5735 | 284 else if (curs_top) /* put cursor on first line, for ">>" */ |
| 7 | 285 { |
| 286 curwin->w_cursor.lnum = oap->start.lnum; | |
| 287 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
| 288 } | |
| 289 else | |
| 290 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
| 291 | |
|
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
292 #ifdef FEAT_FOLDING |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
293 /* 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
|
294 foldOpenCursor(); |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
295 #endif |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
296 |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
297 |
| 7 | 298 if (oap->line_count > p_report) |
| 299 { | |
| 300 if (oap->op_type == OP_RSHIFT) | |
| 301 s = (char_u *)">"; | |
| 302 else | |
| 303 s = (char_u *)"<"; | |
| 304 if (oap->line_count == 1) | |
| 305 { | |
| 306 if (amount == 1) | |
| 307 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
| 308 else | |
| 309 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
| 310 } | |
| 311 else | |
| 312 { | |
| 313 if (amount == 1) | |
| 314 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
| 315 oap->line_count, s); | |
| 316 else | |
| 317 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
| 318 oap->line_count, s, amount); | |
| 319 } | |
| 320 msg(IObuff); | |
| 321 } | |
| 322 | |
| 323 /* | |
| 324 * Set "'[" and "']" marks. | |
| 325 */ | |
| 326 curbuf->b_op_start = oap->start; | |
| 327 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 328 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 329 if (curbuf->b_op_end.col > 0) | |
| 330 --curbuf->b_op_end.col; | |
| 331 } | |
| 332 | |
| 333 /* | |
| 334 * shift the current line one shiftwidth left (if left != 0) or right | |
| 335 * leaves cursor on first blank in the line | |
| 336 */ | |
| 337 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
338 shift_line( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
339 int left, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
340 int round, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
341 int amount, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
342 int call_changed_bytes) /* call changed_bytes() */ |
| 7 | 343 { |
| 344 int count; | |
| 345 int i, j; | |
| 5438 | 346 int p_sw = (int)get_sw_value(curbuf); |
| 7 | 347 |
| 348 count = get_indent(); /* get current indent */ | |
| 349 | |
| 350 if (round) /* round off indent */ | |
| 351 { | |
| 352 i = count / p_sw; /* number of p_sw rounded down */ | |
| 353 j = count % p_sw; /* extra spaces */ | |
| 354 if (j && left) /* first remove extra spaces */ | |
| 355 --amount; | |
| 356 if (left) | |
| 357 { | |
| 358 i -= amount; | |
| 359 if (i < 0) | |
| 360 i = 0; | |
| 361 } | |
| 362 else | |
| 363 i += amount; | |
| 364 count = i * p_sw; | |
| 365 } | |
| 366 else /* original vi indent */ | |
| 367 { | |
| 368 if (left) | |
| 369 { | |
| 370 count -= p_sw * amount; | |
| 371 if (count < 0) | |
| 372 count = 0; | |
| 373 } | |
| 374 else | |
| 375 count += p_sw * amount; | |
| 376 } | |
| 377 | |
| 378 /* Set new indent */ | |
| 379 if (State & VREPLACE_FLAG) | |
| 1516 | 380 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
| 7 | 381 else |
| 1516 | 382 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
| 7 | 383 } |
| 384 | |
| 385 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 386 /* | |
| 387 * Shift one line of the current block one shiftwidth right or left. | |
| 388 * Leaves cursor on first character in block. | |
| 389 */ | |
| 390 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
391 shift_block(oparg_T *oap, int amount) |
| 7 | 392 { |
| 393 int left = (oap->op_type == OP_LSHIFT); | |
| 394 int oldstate = State; | |
| 1839 | 395 int total; |
| 396 char_u *newp, *oldp; | |
| 7 | 397 int oldcol = curwin->w_cursor.col; |
| 5438 | 398 int p_sw = (int)get_sw_value(curbuf); |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
399 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
400 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
|
401 #endif |
| 7 | 402 int p_ts = (int)curbuf->b_p_ts; |
| 403 struct block_def bd; | |
| 404 int incr; | |
| 1839 | 405 colnr_T ws_vcol; |
| 7 | 406 int i = 0, j = 0; |
| 407 int len; | |
| 408 #ifdef FEAT_RIGHTLEFT | |
| 409 int old_p_ri = p_ri; | |
| 410 | |
| 4352 | 411 p_ri = 0; /* don't want revins in indent */ |
| 7 | 412 #endif |
| 413 | |
| 414 State = INSERT; /* don't want REPLACE for State */ | |
| 415 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
| 416 if (bd.is_short) | |
| 417 return; | |
| 418 | |
| 419 /* 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
|
420 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
|
421 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
|
422 return; /* multiplication overflow */ |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
423 |
| 7 | 424 oldp = ml_get_curline(); |
| 425 | |
| 426 if (!left) | |
| 427 { | |
| 428 /* | |
| 429 * 1. Get start vcol | |
| 430 * 2. Total ws vcols | |
| 431 * 3. Divvy into TABs & spp | |
| 432 * 4. Construct new string | |
| 433 */ | |
| 434 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
| 435 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
| 436 if (bd.startspaces) | |
| 437 { | |
| 438 #ifdef FEAT_MBYTE | |
| 439 if (has_mbyte) | |
|
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
440 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
441 if ((*mb_ptr2len)(bd.textstart) == 1) |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
442 ++bd.textstart; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
443 else |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
444 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
445 ws_vcol = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
446 bd.startspaces = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
447 } |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
448 } |
| 1995 | 449 else |
| 450 #endif | |
| 451 ++bd.textstart; | |
| 7 | 452 } |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
453 for ( ; VIM_ISWHITE(*bd.textstart); ) |
| 7 | 454 { |
| 5995 | 455 /* TODO: is passing bd.textstart for start of the line OK? */ |
| 456 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
| 457 (colnr_T)(bd.start_vcol)); | |
| 7 | 458 total += incr; |
| 459 bd.start_vcol += incr; | |
| 460 } | |
| 461 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
| 462 * 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
|
463 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
464 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
|
465 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
|
466 else |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
467 j = total; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
468 #else |
| 7 | 469 if (!curbuf->b_p_et) |
| 470 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
| 471 if (i) | |
| 472 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
| 473 else | |
| 474 j = total; | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
475 #endif |
| 7 | 476 /* if we're splitting a TAB, allow for it */ |
| 477 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
| 478 len = (int)STRLEN(bd.textstart) + 1; | |
| 479 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
| 480 if (newp == NULL) | |
| 481 return; | |
| 482 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
| 483 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 6929 | 484 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
| 485 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
| 7 | 486 /* the end */ |
| 487 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
| 488 } | |
| 489 else /* left */ | |
| 490 { | |
| 1839 | 491 colnr_T destination_col; /* column to which text in block will |
| 492 be shifted */ | |
| 493 char_u *verbatim_copy_end; /* end of the part of the line which is | |
| 494 copied verbatim */ | |
| 495 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
| 496 of line */ | |
| 497 unsigned fill; /* nr of spaces that replace a TAB */ | |
| 498 unsigned new_line_len; /* the length of the line after the | |
| 499 block shift */ | |
| 500 size_t block_space_width; | |
| 501 size_t shift_amount; | |
| 502 char_u *non_white = bd.textstart; | |
| 503 colnr_T non_white_col; | |
| 504 | |
| 505 /* | |
| 506 * Firstly, let's find the first non-whitespace character that is | |
| 507 * displayed after the block's start column and the character's column | |
| 508 * number. Also, let's calculate the width of all the whitespace | |
| 509 * characters that are displayed in the block and precede the searched | |
| 510 * non-whitespace character. | |
| 511 */ | |
| 512 | |
| 513 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
| 514 * the part of which is displayed at the block's beginning. Let's start | |
| 515 * searching from the next character. */ | |
| 516 if (bd.startspaces) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
517 MB_PTR_ADV(non_white); |
| 1839 | 518 |
| 519 /* The character's column is in "bd.start_vcol". */ | |
| 520 non_white_col = bd.start_vcol; | |
| 521 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
522 while (VIM_ISWHITE(*non_white)) |
| 7 | 523 { |
| 5995 | 524 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
| 1839 | 525 non_white_col += incr; |
| 7 | 526 } |
| 1839 | 527 |
| 528 block_space_width = non_white_col - oap->start_vcol; | |
| 529 /* We will shift by "total" or "block_space_width", whichever is less. | |
| 530 */ | |
| 1860 | 531 shift_amount = (block_space_width < (size_t)total |
| 532 ? block_space_width : (size_t)total); | |
| 1839 | 533 |
| 534 /* The column to which we will shift the text. */ | |
| 1860 | 535 destination_col = (colnr_T)(non_white_col - shift_amount); |
| 1839 | 536 |
| 537 /* Now let's find out how much of the beginning of the line we can | |
| 538 * reuse without modification. */ | |
| 539 verbatim_copy_end = bd.textstart; | |
| 540 verbatim_copy_width = bd.start_vcol; | |
| 541 | |
| 542 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
| 543 * preceding the block. We have to subtract its width to obtain its | |
| 544 * column number. */ | |
| 545 if (bd.startspaces) | |
| 546 verbatim_copy_width -= bd.start_char_vcols; | |
| 547 while (verbatim_copy_width < destination_col) | |
| 7 | 548 { |
| 5995 | 549 char_u *line = verbatim_copy_end; |
| 550 | |
| 551 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
| 552 incr = lbr_chartabsize(line, verbatim_copy_end, | |
| 553 verbatim_copy_width); | |
| 1839 | 554 if (verbatim_copy_width + incr > destination_col) |
| 555 break; | |
| 556 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
|
557 MB_PTR_ADV(verbatim_copy_end); |
| 7 | 558 } |
| 559 | |
| 1839 | 560 /* If "destination_col" is different from the width of the initial |
| 561 * part of the line that will be copied, it means we encountered a tab | |
| 562 * character, which we will have to partly replace with spaces. */ | |
| 563 fill = destination_col - verbatim_copy_width; | |
| 564 | |
| 565 /* The replacement line will consist of: | |
| 566 * - the beginning of the original line up to "verbatim_copy_end", | |
| 567 * - "fill" number of spaces, | |
| 568 * - the rest of the line, pointed to by non_white. */ | |
| 569 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
| 570 + fill | |
| 571 + (unsigned)STRLEN(non_white) + 1; | |
| 572 | |
| 573 newp = alloc_check(new_line_len); | |
| 7 | 574 if (newp == NULL) |
| 575 return; | |
| 1839 | 576 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
| 6929 | 577 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
| 1839 | 578 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
| 7 | 579 } |
| 580 /* replace the line */ | |
| 581 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 582 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
| 583 State = oldstate; | |
| 584 curwin->w_cursor.col = oldcol; | |
| 585 #ifdef FEAT_RIGHTLEFT | |
| 586 p_ri = old_p_ri; | |
| 587 #endif | |
| 588 } | |
| 589 #endif | |
| 590 | |
| 591 #ifdef FEAT_VISUALEXTRA | |
| 592 /* | |
| 593 * Insert string "s" (b_insert ? before : after) block :AKelly | |
| 594 * Caller must prepare for undo. | |
| 595 */ | |
| 596 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
597 block_insert( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
598 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
599 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
600 int b_insert, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
601 struct block_def *bdp) |
| 7 | 602 { |
| 603 int p_ts; | |
| 604 int count = 0; /* extra spaces to replace a cut TAB */ | |
| 605 int spaces = 0; /* non-zero if cutting a TAB */ | |
| 606 colnr_T offset; /* pointer along new line */ | |
| 607 unsigned s_len; /* STRLEN(s) */ | |
| 608 char_u *newp, *oldp; /* new, old lines */ | |
| 609 linenr_T lnum; /* loop var */ | |
| 610 int oldstate = State; | |
| 611 | |
| 612 State = INSERT; /* don't want REPLACE for State */ | |
| 613 s_len = (unsigned)STRLEN(s); | |
| 614 | |
| 615 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
| 616 { | |
| 617 block_prep(oap, bdp, lnum, TRUE); | |
| 618 if (bdp->is_short && b_insert) | |
| 619 continue; /* OP_INSERT, line ends before block start */ | |
| 620 | |
| 621 oldp = ml_get(lnum); | |
| 622 | |
| 623 if (b_insert) | |
| 624 { | |
| 625 p_ts = bdp->start_char_vcols; | |
| 626 spaces = bdp->startspaces; | |
| 627 if (spaces != 0) | |
| 628 count = p_ts - 1; /* we're cutting a TAB */ | |
| 629 offset = bdp->textcol; | |
| 630 } | |
| 631 else /* append */ | |
| 632 { | |
| 633 p_ts = bdp->end_char_vcols; | |
| 634 if (!bdp->is_short) /* spaces = padding after block */ | |
| 635 { | |
| 636 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
| 637 if (spaces != 0) | |
| 638 count = p_ts - 1; /* we're cutting a TAB */ | |
| 639 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
| 640 } | |
| 641 else /* spaces = padding to block edge */ | |
| 642 { | |
| 643 /* if $ used, just append to EOL (ie spaces==0) */ | |
| 644 if (!bdp->is_MAX) | |
| 645 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
| 646 count = spaces; | |
| 647 offset = bdp->textcol + bdp->textlen; | |
| 648 } | |
| 649 } | |
| 650 | |
| 6140 | 651 #ifdef FEAT_MBYTE |
| 652 if (has_mbyte && spaces > 0) | |
| 653 { | |
| 6460 | 654 int off; |
| 655 | |
| 6140 | 656 /* Avoid starting halfway a multi-byte character. */ |
| 657 if (b_insert) | |
| 658 { | |
| 6460 | 659 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| 6140 | 660 } |
| 661 else | |
| 662 { | |
| 6460 | 663 off = (*mb_off_next)(oldp, oldp + offset); |
| 6140 | 664 offset += off; |
| 665 } | |
| 6460 | 666 spaces -= off; |
| 667 count -= off; | |
| 6140 | 668 } |
| 669 #endif | |
| 670 | |
| 7 | 671 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
| 672 if (newp == NULL) | |
| 673 continue; | |
| 674 | |
| 675 /* copy up to shifted part */ | |
| 676 mch_memmove(newp, oldp, (size_t)(offset)); | |
| 677 oldp += offset; | |
| 678 | |
| 679 /* insert pre-padding */ | |
| 6929 | 680 vim_memset(newp + offset, ' ', (size_t)spaces); |
| 7 | 681 |
| 682 /* copy the new text */ | |
| 683 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
| 684 offset += s_len; | |
| 685 | |
| 686 if (spaces && !bdp->is_short) | |
| 687 { | |
| 688 /* insert post-padding */ | |
| 6929 | 689 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
| 7 | 690 /* We're splitting a TAB, don't copy it. */ |
| 691 oldp++; | |
| 692 /* We allowed for that TAB, remember this now */ | |
| 693 count++; | |
| 694 } | |
| 695 | |
| 696 if (spaces > 0) | |
| 697 offset += count; | |
| 1622 | 698 STRMOVE(newp + offset, oldp); |
| 7 | 699 |
| 700 ml_replace(lnum, newp, FALSE); | |
| 701 | |
| 702 if (lnum == oap->end.lnum) | |
| 703 { | |
| 704 /* Set "']" mark to the end of the block instead of the end of | |
| 705 * the insert in the first line. */ | |
| 706 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 707 curbuf->b_op_end.col = offset; | |
| 708 } | |
| 709 } /* for all lnum */ | |
| 710 | |
| 711 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 712 | |
| 713 State = oldstate; | |
| 714 } | |
| 715 #endif | |
| 716 | |
| 717 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 718 /* | |
| 719 * op_reindent - handle reindenting a block of lines. | |
| 720 */ | |
| 721 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
722 op_reindent(oparg_T *oap, int (*how)(void)) |
| 7 | 723 { |
| 724 long i; | |
| 725 char_u *l; | |
| 6971 | 726 int amount; |
| 7 | 727 linenr_T first_changed = 0; |
| 728 linenr_T last_changed = 0; | |
| 729 linenr_T start_lnum = curwin->w_cursor.lnum; | |
| 730 | |
| 216 | 731 /* Don't even try when 'modifiable' is off. */ |
| 732 if (!curbuf->b_p_ma) | |
| 733 { | |
| 734 EMSG(_(e_modifiable)); | |
| 735 return; | |
| 736 } | |
| 737 | |
| 7 | 738 for (i = oap->line_count; --i >= 0 && !got_int; ) |
| 739 { | |
| 740 /* it's a slow thing to do, so give feedback so there's no worry that | |
| 741 * the computer's just hung. */ | |
| 742 | |
| 743 if (i > 1 | |
| 744 && (i % 50 == 0 || i == oap->line_count - 1) | |
| 745 && oap->line_count > p_report) | |
| 746 smsg((char_u *)_("%ld lines to indent... "), i); | |
| 747 | |
| 748 /* | |
| 749 * Be vi-compatible: For lisp indenting the first line is not | |
| 750 * indented, unless there is only one line. | |
| 751 */ | |
| 752 #ifdef FEAT_LISP | |
| 753 if (i != oap->line_count - 1 || oap->line_count == 1 | |
| 754 || how != get_lisp_indent) | |
| 755 #endif | |
| 756 { | |
| 757 l = skipwhite(ml_get_curline()); | |
| 758 if (*l == NUL) /* empty or blank line */ | |
| 6971 | 759 amount = 0; |
| 7 | 760 else |
| 6971 | 761 amount = how(); /* get the indent for this line */ |
| 762 | |
| 763 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
| 7 | 764 { |
| 765 /* did change the indent, call changed_lines() later */ | |
| 766 if (first_changed == 0) | |
| 767 first_changed = curwin->w_cursor.lnum; | |
| 768 last_changed = curwin->w_cursor.lnum; | |
| 769 } | |
| 770 } | |
| 771 ++curwin->w_cursor.lnum; | |
| 1550 | 772 curwin->w_cursor.col = 0; /* make sure it's valid */ |
| 7 | 773 } |
| 774 | |
| 775 /* put cursor on first non-blank of indented line */ | |
| 776 curwin->w_cursor.lnum = start_lnum; | |
| 777 beginline(BL_SOL | BL_FIX); | |
| 778 | |
| 779 /* Mark changed lines so that they will be redrawn. When Visual | |
| 780 * highlighting was present, need to continue until the last line. When | |
| 781 * there is no change still need to remove the Visual highlighting. */ | |
| 782 if (last_changed != 0) | |
| 783 changed_lines(first_changed, 0, | |
| 784 oap->is_VIsual ? start_lnum + oap->line_count : | |
| 785 last_changed + 1, 0L); | |
| 786 else if (oap->is_VIsual) | |
| 787 redraw_curbuf_later(INVERTED); | |
| 788 | |
| 789 if (oap->line_count > p_report) | |
| 790 { | |
| 791 i = oap->line_count - (i + 1); | |
| 792 if (i == 1) | |
| 793 MSG(_("1 line indented ")); | |
| 794 else | |
| 795 smsg((char_u *)_("%ld lines indented "), i); | |
| 796 } | |
| 797 /* set '[ and '] marks */ | |
| 798 curbuf->b_op_start = oap->start; | |
| 799 curbuf->b_op_end = oap->end; | |
| 800 } | |
| 801 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
| 802 | |
| 803 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 804 /* | |
| 805 * Keep the last expression line here, for repeating. | |
| 806 */ | |
| 807 static char_u *expr_line = NULL; | |
| 808 | |
| 809 /* | |
| 810 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
| 811 * Returns '=' when OK, NUL otherwise. | |
| 812 */ | |
| 813 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
814 get_expr_register(void) |
| 7 | 815 { |
| 816 char_u *new_line; | |
| 817 | |
| 818 new_line = getcmdline('=', 0L, 0); | |
| 819 if (new_line == NULL) | |
| 820 return NUL; | |
| 821 if (*new_line == NUL) /* use previous line */ | |
| 822 vim_free(new_line); | |
| 823 else | |
| 824 set_expr_line(new_line); | |
| 825 return '='; | |
| 826 } | |
| 827 | |
| 828 /* | |
| 829 * Set the expression for the '=' register. | |
| 830 * Argument must be an allocated string. | |
| 831 */ | |
| 832 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
833 set_expr_line(char_u *new_line) |
| 7 | 834 { |
| 835 vim_free(expr_line); | |
| 836 expr_line = new_line; | |
| 837 } | |
| 838 | |
| 839 /* | |
| 840 * Get the result of the '=' register expression. | |
| 841 * Returns a pointer to allocated memory, or NULL for failure. | |
| 842 */ | |
| 843 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
844 get_expr_line(void) |
| 7 | 845 { |
| 846 char_u *expr_copy; | |
| 847 char_u *rv; | |
| 994 | 848 static int nested = 0; |
| 7 | 849 |
| 850 if (expr_line == NULL) | |
| 851 return NULL; | |
| 852 | |
| 853 /* Make a copy of the expression, because evaluating it may cause it to be | |
| 854 * changed. */ | |
| 855 expr_copy = vim_strsave(expr_line); | |
| 856 if (expr_copy == NULL) | |
| 857 return NULL; | |
| 858 | |
| 994 | 859 /* When we are invoked recursively limit the evaluation to 10 levels. |
| 860 * Then return the string as-is. */ | |
| 861 if (nested >= 10) | |
| 862 return expr_copy; | |
| 863 | |
| 864 ++nested; | |
| 714 | 865 rv = eval_to_string(expr_copy, NULL, TRUE); |
| 994 | 866 --nested; |
| 7 | 867 vim_free(expr_copy); |
| 868 return rv; | |
| 869 } | |
| 283 | 870 |
| 871 /* | |
| 872 * Get the '=' register expression itself, without evaluating it. | |
| 873 */ | |
| 874 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
875 get_expr_line_src(void) |
| 283 | 876 { |
| 877 if (expr_line == NULL) | |
| 878 return NULL; | |
| 879 return vim_strsave(expr_line); | |
| 880 } | |
| 7 | 881 #endif /* FEAT_EVAL */ |
| 882 | |
| 883 /* | |
| 884 * Check if 'regname' is a valid name of a yank register. | |
| 885 * Note: There is no check for 0 (default register), caller should do this | |
| 886 */ | |
| 887 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
888 valid_yank_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
889 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
890 int writing) /* if TRUE check for writable registers */ |
| 7 | 891 { |
| 892 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
| 893 || (!writing && vim_strchr((char_u *) | |
| 894 #ifdef FEAT_EVAL | |
| 6557 | 895 "/.%:=" |
| 7 | 896 #else |
| 6557 | 897 "/.%:" |
| 7 | 898 #endif |
| 899 , regname) != NULL) | |
| 6557 | 900 || regname == '#' |
| 7 | 901 || regname == '"' |
| 902 || regname == '-' | |
| 903 || regname == '_' | |
| 904 #ifdef FEAT_CLIPBOARD | |
| 905 || regname == '*' | |
| 906 || regname == '+' | |
| 907 #endif | |
| 908 #ifdef FEAT_DND | |
| 909 || (!writing && regname == '~') | |
| 910 #endif | |
| 911 ) | |
| 912 return TRUE; | |
| 913 return FALSE; | |
| 914 } | |
| 915 | |
| 916 /* | |
| 917 * Set y_current and y_append, according to the value of "regname". | |
| 918 * Cannot handle the '_' register. | |
| 140 | 919 * Must only be called with a valid register name! |
| 7 | 920 * |
| 921 * If regname is 0 and writing, use register 0 | |
| 922 * 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
|
923 * |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
924 * 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
|
925 * clipboard). |
| 7 | 926 */ |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
927 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
928 get_yank_register(int regname, int writing) |
| 7 | 929 { |
| 930 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
|
931 int ret = FALSE; |
| 7 | 932 |
| 933 y_append = FALSE; | |
| 934 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
| 935 { | |
| 936 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
|
937 return ret; |
| 7 | 938 } |
| 939 i = regname; | |
| 940 if (VIM_ISDIGIT(i)) | |
| 941 i -= '0'; | |
| 942 else if (ASCII_ISLOWER(i)) | |
| 943 i = CharOrdLow(i) + 10; | |
| 944 else if (ASCII_ISUPPER(i)) | |
| 945 { | |
| 946 i = CharOrdUp(i) + 10; | |
| 947 y_append = TRUE; | |
| 948 } | |
| 949 else if (regname == '-') | |
| 950 i = DELETION_REGISTER; | |
| 951 #ifdef FEAT_CLIPBOARD | |
| 952 /* When selection is not available, use register 0 instead of '*' */ | |
| 953 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
|
954 { |
| 7 | 955 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
|
956 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
957 } |
| 7 | 958 /* When clipboard is not available, use register 0 instead of '+' */ |
| 959 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
|
960 { |
| 7 | 961 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
|
962 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
963 } |
| 7 | 964 #endif |
| 965 #ifdef FEAT_DND | |
| 966 else if (!writing && regname == '~') | |
| 967 i = TILDE_REGISTER; | |
| 968 #endif | |
| 969 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
| 970 i = 0; | |
| 971 y_current = &(y_regs[i]); | |
| 972 if (writing) /* remember the register we write into for do_put() */ | |
| 973 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
|
974 return ret; |
| 7 | 975 } |
| 976 | |
| 15 | 977 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
| 7 | 978 /* |
| 979 * When "regname" is a clipboard register, obtain the selection. If it's not | |
| 980 * available return zero, otherwise return "regname". | |
| 981 */ | |
| 15 | 982 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
983 may_get_selection(int regname) |
| 7 | 984 { |
| 985 if (regname == '*') | |
| 986 { | |
| 987 if (!clip_star.available) | |
| 988 regname = 0; | |
| 989 else | |
| 990 clip_get_selection(&clip_star); | |
| 991 } | |
| 992 else if (regname == '+') | |
| 993 { | |
| 994 if (!clip_plus.available) | |
| 995 regname = 0; | |
| 996 else | |
| 997 clip_get_selection(&clip_plus); | |
| 998 } | |
| 999 return regname; | |
| 1000 } | |
| 1001 #endif | |
| 1002 | |
| 1003 /* | |
| 1004 * Obtain the contents of a "normal" register. The register is made empty. | |
| 1005 * The returned pointer has allocated memory, use put_register() later. | |
| 1006 */ | |
| 1007 void * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1008 get_register( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1009 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1010 int copy) /* make a copy, if FALSE make register empty. */ |
| 7 | 1011 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1012 yankreg_T *reg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1013 int i; |
| 7 | 1014 |
| 1015 #ifdef FEAT_CLIPBOARD | |
| 1016 /* When Visual area changed, may have to update selection. Obtain the | |
| 1017 * selection too. */ | |
| 1435 | 1018 if (name == '*' && clip_star.available) |
| 7 | 1019 { |
| 3674 | 1020 if (clip_isautosel_star()) |
| 1021 clip_update_selection(&clip_star); | |
| 1022 may_get_selection(name); | |
| 1023 } | |
| 1024 if (name == '+' && clip_plus.available) | |
| 1025 { | |
| 1026 if (clip_isautosel_plus()) | |
| 1027 clip_update_selection(&clip_plus); | |
| 7 | 1028 may_get_selection(name); |
| 1029 } | |
| 1030 #endif | |
| 1031 | |
| 1032 get_yank_register(name, 0); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1033 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
| 7 | 1034 if (reg != NULL) |
| 1035 { | |
| 1036 *reg = *y_current; | |
| 1037 if (copy) | |
| 1038 { | |
| 1039 /* If we run out of memory some or all of the lines are empty. */ | |
| 1040 if (reg->y_size == 0) | |
| 1041 reg->y_array = NULL; | |
| 1042 else | |
| 1043 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
| 1044 * reg->y_size)); | |
| 1045 if (reg->y_array != NULL) | |
| 1046 { | |
| 1047 for (i = 0; i < reg->y_size; ++i) | |
| 1048 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
| 1049 } | |
| 1050 } | |
| 1051 else | |
| 1052 y_current->y_array = NULL; | |
| 1053 } | |
| 1054 return (void *)reg; | |
| 1055 } | |
| 1056 | |
| 1057 /* | |
| 1451 | 1058 * Put "reg" into register "name". Free any previous contents and "reg". |
| 7 | 1059 */ |
| 1060 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1061 put_register(int name, void *reg) |
| 7 | 1062 { |
| 1063 get_yank_register(name, 0); | |
| 1064 free_yank_all(); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1065 *y_current = *(yankreg_T *)reg; |
| 1451 | 1066 vim_free(reg); |
| 7 | 1067 |
| 5735 | 1068 #ifdef FEAT_CLIPBOARD |
| 7 | 1069 /* Send text written to clipboard register to the clipboard. */ |
| 1070 may_set_selection(); | |
| 5735 | 1071 #endif |
| 7 | 1072 } |
| 4209 | 1073 |
| 1074 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1075 free_register(void *reg) |
| 4209 | 1076 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1077 yankreg_T tmp; |
| 4209 | 1078 |
| 1079 tmp = *y_current; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1080 *y_current = *(yankreg_T *)reg; |
| 4209 | 1081 free_yank_all(); |
| 1082 vim_free(reg); | |
| 1083 *y_current = tmp; | |
| 1084 } | |
| 7 | 1085 |
| 1086 #if defined(FEAT_MOUSE) || defined(PROTO) | |
| 1087 /* | |
| 1088 * return TRUE if the current yank register has type MLINE | |
| 1089 */ | |
| 1090 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1091 yank_register_mline(int regname) |
| 7 | 1092 { |
| 1093 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
| 1094 return FALSE; | |
| 1095 if (regname == '_') /* black hole is always empty */ | |
| 1096 return FALSE; | |
| 1097 get_yank_register(regname, FALSE); | |
| 1098 return (y_current->y_type == MLINE); | |
| 1099 } | |
| 1100 #endif | |
| 1101 | |
| 1102 /* | |
| 1157 | 1103 * Start or stop recording into a yank register. |
| 7 | 1104 * |
| 1157 | 1105 * Return FAIL for failure, OK otherwise. |
| 7 | 1106 */ |
| 1107 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1108 do_record(int c) |
| 7 | 1109 { |
| 1157 | 1110 char_u *p; |
| 1111 static int regname; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1112 yankreg_T *old_y_previous, *old_y_current; |
| 1157 | 1113 int retval; |
| 7 | 1114 |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1115 if (reg_recording == 0) /* start recording */ |
| 7 | 1116 { |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1117 /* registers 0-9, a-z and " are allowed */ |
| 7 | 1118 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
| 1119 retval = FAIL; | |
| 1120 else | |
| 1121 { | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1122 reg_recording = c; |
| 7 | 1123 showmode(); |
| 1124 regname = c; | |
| 1125 retval = OK; | |
| 1126 } | |
| 1127 } | |
| 1128 else /* stop recording */ | |
| 1129 { | |
| 1130 /* | |
| 1157 | 1131 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
| 1132 * needs to be removed again to put it in a register. exec_reg then | |
| 1133 * adds the escaping back later. | |
| 7 | 1134 */ |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1135 reg_recording = 0; |
| 7 | 1136 MSG(""); |
| 1137 p = get_recorded(); | |
| 1138 if (p == NULL) | |
| 1139 retval = FAIL; | |
| 1140 else | |
| 1141 { | |
| 1081 | 1142 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
| 1143 vim_unescape_csi(p); | |
| 1144 | |
| 7 | 1145 /* |
| 1146 * We don't want to change the default register here, so save and | |
| 1147 * restore the current register name. | |
| 1148 */ | |
| 1149 old_y_previous = y_previous; | |
| 1150 old_y_current = y_current; | |
| 1151 | |
| 1152 retval = stuff_yank(regname, p); | |
| 1153 | |
| 1154 y_previous = old_y_previous; | |
| 1155 y_current = old_y_current; | |
| 1156 } | |
| 1157 } | |
| 1158 return retval; | |
| 1159 } | |
| 1160 | |
| 1161 /* | |
| 1162 * Stuff string "p" into yank register "regname" as a single line (append if | |
| 1163 * uppercase). "p" must have been alloced. | |
| 1164 * | |
| 1165 * return FAIL for failure, OK otherwise | |
| 1166 */ | |
| 1167 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1168 stuff_yank(int regname, char_u *p) |
| 7 | 1169 { |
| 1170 char_u *lp; | |
| 1171 char_u **pp; | |
| 1172 | |
| 1173 /* check for read-only register */ | |
| 1174 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
| 1175 { | |
| 1176 vim_free(p); | |
| 1177 return FAIL; | |
| 1178 } | |
| 1179 if (regname == '_') /* black hole: don't do anything */ | |
| 1180 { | |
| 1181 vim_free(p); | |
| 1182 return OK; | |
| 1183 } | |
| 1184 get_yank_register(regname, TRUE); | |
| 1185 if (y_append && y_current->y_array != NULL) | |
| 1186 { | |
| 1187 pp = &(y_current->y_array[y_current->y_size - 1]); | |
| 1188 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
| 1189 if (lp == NULL) | |
| 1190 { | |
| 1191 vim_free(p); | |
| 1192 return FAIL; | |
| 1193 } | |
| 1194 STRCPY(lp, *pp); | |
| 1195 STRCAT(lp, p); | |
| 1196 vim_free(p); | |
| 1197 vim_free(*pp); | |
| 1198 *pp = lp; | |
| 1199 } | |
| 1200 else | |
| 1201 { | |
| 1202 free_yank_all(); | |
| 1203 if ((y_current->y_array = | |
| 1204 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
| 1205 { | |
| 1206 vim_free(p); | |
| 1207 return FAIL; | |
| 1208 } | |
| 1209 y_current->y_array[0] = p; | |
| 1210 y_current->y_size = 1; | |
| 1211 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
|
1212 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1213 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
|
1214 #endif |
| 7 | 1215 } |
| 1216 return OK; | |
| 1217 } | |
| 1218 | |
| 1893 | 1219 static int execreg_lastc = NUL; |
| 1220 | |
| 7 | 1221 /* |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1222 * Execute a yank register: copy it into the stuff buffer. |
| 7 | 1223 * |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1224 * Return FAIL for failure, OK otherwise. |
| 7 | 1225 */ |
| 1226 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1227 do_execreg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1228 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1229 int colon, /* insert ':' before each line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1230 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
|
1231 int silent) /* set "silent" flag in typeahead buffer */ |
| 7 | 1232 { |
| 1233 long i; | |
| 1234 char_u *p; | |
| 1235 int retval = OK; | |
| 1236 int remap; | |
| 1237 | |
| 1238 if (regname == '@') /* repeat previous one */ | |
| 168 | 1239 { |
| 1893 | 1240 if (execreg_lastc == NUL) |
| 168 | 1241 { |
| 1242 EMSG(_("E748: No previously used register")); | |
| 1243 return FAIL; | |
| 1244 } | |
| 1893 | 1245 regname = execreg_lastc; |
| 168 | 1246 } |
| 7 | 1247 /* check for valid regname */ |
| 1248 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
| 168 | 1249 { |
| 1250 emsg_invreg(regname); | |
| 7 | 1251 return FAIL; |
| 168 | 1252 } |
| 1893 | 1253 execreg_lastc = regname; |
| 7 | 1254 |
| 1255 #ifdef FEAT_CLIPBOARD | |
| 1256 regname = may_get_selection(regname); | |
| 1257 #endif | |
| 1258 | |
| 1259 if (regname == '_') /* black hole: don't stuff anything */ | |
| 1260 return OK; | |
| 1261 | |
| 1262 #ifdef FEAT_CMDHIST | |
| 1263 if (regname == ':') /* use last command line */ | |
| 1264 { | |
| 1265 if (last_cmdline == NULL) | |
| 1266 { | |
| 1267 EMSG(_(e_nolastcmd)); | |
| 1268 return FAIL; | |
| 1269 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
1270 VIM_CLEAR(new_last_cmdline); /* don't keep the cmdline containing @: */ |
| 16 | 1271 /* Escape all control characters with a CTRL-V */ |
| 1272 p = vim_strsave_escaped_ext(last_cmdline, | |
| 20 | 1273 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
| 16 | 1274 if (p != NULL) |
| 480 | 1275 { |
| 1276 /* When in Visual mode "'<,'>" will be prepended to the command. | |
| 1277 * Remove it when it's already there. */ | |
| 1278 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
| 1077 | 1279 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
| 480 | 1280 else |
| 1077 | 1281 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
| 480 | 1282 } |
| 16 | 1283 vim_free(p); |
| 7 | 1284 } |
| 1285 #endif | |
| 1286 #ifdef FEAT_EVAL | |
| 1287 else if (regname == '=') | |
| 1288 { | |
| 1289 p = get_expr_line(); | |
| 1290 if (p == NULL) | |
| 1291 return FAIL; | |
| 1077 | 1292 retval = put_in_typebuf(p, TRUE, colon, silent); |
| 7 | 1293 vim_free(p); |
| 1294 } | |
| 1295 #endif | |
| 1296 else if (regname == '.') /* use last inserted text */ | |
| 1297 { | |
| 1298 p = get_last_insert_save(); | |
| 1299 if (p == NULL) | |
| 1300 { | |
| 1301 EMSG(_(e_noinstext)); | |
| 1302 return FAIL; | |
| 1303 } | |
| 1077 | 1304 retval = put_in_typebuf(p, FALSE, colon, silent); |
| 7 | 1305 vim_free(p); |
| 1306 } | |
| 1307 else | |
| 1308 { | |
| 1309 get_yank_register(regname, FALSE); | |
| 1310 if (y_current->y_array == NULL) | |
| 1311 return FAIL; | |
| 1312 | |
| 1313 /* Disallow remaping for ":@r". */ | |
| 1314 remap = colon ? REMAP_NONE : REMAP_YES; | |
| 1315 | |
| 1316 /* | |
| 1317 * Insert lines into typeahead buffer, from last one to first one. | |
| 1318 */ | |
| 1034 | 1319 put_reedit_in_typebuf(silent); |
| 7 | 1320 for (i = y_current->y_size; --i >= 0; ) |
| 1321 { | |
| 1077 | 1322 char_u *escaped; |
| 1323 | |
| 7 | 1324 /* insert NL between lines and after last line if type is MLINE */ |
| 1325 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
| 1326 || addcr) | |
| 1327 { | |
| 1034 | 1328 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
| 7 | 1329 return FAIL; |
| 1330 } | |
| 1077 | 1331 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
| 1332 if (escaped == NULL) | |
| 1333 return FAIL; | |
| 1334 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
| 1335 vim_free(escaped); | |
| 1336 if (retval == FAIL) | |
| 7 | 1337 return FAIL; |
| 1034 | 1338 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
| 7 | 1339 == FAIL) |
| 1340 return FAIL; | |
| 1341 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1342 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
| 7 | 1343 } |
| 1344 return retval; | |
| 1345 } | |
| 1346 | |
| 1347 /* | |
| 1348 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
| 1349 * used only after other typeahead has been processed. | |
| 1350 */ | |
| 1351 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1352 put_reedit_in_typebuf(int silent) |
| 7 | 1353 { |
| 1354 char_u buf[3]; | |
| 1355 | |
| 1356 if (restart_edit != NUL) | |
| 1357 { | |
| 1358 if (restart_edit == 'V') | |
| 1359 { | |
| 1360 buf[0] = 'g'; | |
| 1361 buf[1] = 'R'; | |
| 1362 buf[2] = NUL; | |
| 1363 } | |
| 1364 else | |
| 1365 { | |
| 1366 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
| 1367 buf[1] = NUL; | |
| 1368 } | |
| 1034 | 1369 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
| 7 | 1370 restart_edit = NUL; |
| 1371 } | |
| 1372 } | |
| 1373 | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1374 /* |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1375 * 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
|
1376 * executed again. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1377 * 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
|
1378 * no remapping. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1379 */ |
| 7 | 1380 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1381 put_in_typebuf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1382 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1383 int esc, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1384 int colon, /* add ':' before the line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1385 int silent) |
| 7 | 1386 { |
| 1387 int retval = OK; | |
| 1388 | |
| 1034 | 1389 put_reedit_in_typebuf(silent); |
| 7 | 1390 if (colon) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1391 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1392 if (retval == OK) |
| 1077 | 1393 { |
| 1394 char_u *p; | |
| 1395 | |
| 1396 if (esc) | |
| 1397 p = vim_strsave_escape_csi(s); | |
| 1398 else | |
| 1399 p = s; | |
| 1400 if (p == NULL) | |
| 1401 retval = FAIL; | |
| 1402 else | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1403 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
|
1404 0, TRUE, silent); |
| 1077 | 1405 if (esc) |
| 1406 vim_free(p); | |
| 1407 } | |
| 7 | 1408 if (colon && retval == OK) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1409 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1410 return retval; |
| 1411 } | |
| 1412 | |
| 1413 /* | |
| 1414 * Insert a yank register: copy it into the Read buffer. | |
| 1415 * Used by CTRL-R command and middle mouse button in insert mode. | |
| 1416 * | |
| 1417 * return FAIL for failure, OK otherwise | |
| 1418 */ | |
| 1419 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1420 insert_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1421 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
|
1422 int literally_arg) /* insert literally, not as if typed */ |
| 7 | 1423 { |
| 1424 long i; | |
| 1425 int retval = OK; | |
| 1426 char_u *arg; | |
| 1427 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
|
1428 int literally = literally_arg; |
| 7 | 1429 |
| 1430 /* | |
| 1431 * It is possible to get into an endless loop by having CTRL-R a in | |
| 1432 * register a and then, in insert mode, doing CTRL-R a. | |
| 1433 * If you hit CTRL-C, the loop will be broken here. | |
| 1434 */ | |
| 1435 ui_breakcheck(); | |
| 1436 if (got_int) | |
| 1437 return FAIL; | |
| 1438 | |
| 1439 /* check for valid regname */ | |
| 1440 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 1441 return FAIL; | |
| 1442 | |
| 1443 #ifdef FEAT_CLIPBOARD | |
| 1444 regname = may_get_selection(regname); | |
| 1445 #endif | |
| 1446 | |
| 1447 if (regname == '.') /* insert last inserted text */ | |
| 1448 retval = stuff_inserted(NUL, 1L, TRUE); | |
| 1449 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
| 1450 { | |
| 1451 if (arg == NULL) | |
| 1452 return FAIL; | |
| 1453 stuffescaped(arg, literally); | |
| 1454 if (allocated) | |
| 1455 vim_free(arg); | |
| 1456 } | |
| 1457 else /* name or number register */ | |
| 1458 { | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1459 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
|
1460 literally = TRUE; |
| 7 | 1461 if (y_current->y_array == NULL) |
| 1462 retval = FAIL; | |
| 1463 else | |
| 1464 { | |
| 1465 for (i = 0; i < y_current->y_size; ++i) | |
| 1466 { | |
| 1467 stuffescaped(y_current->y_array[i], literally); | |
| 1468 /* | |
| 1469 * Insert a newline between lines and after last line if | |
| 1470 * y_type is MLINE. | |
| 1471 */ | |
| 1472 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 1473 stuffcharReadbuff('\n'); | |
| 1474 } | |
| 1475 } | |
| 1476 } | |
| 1477 | |
| 1478 return retval; | |
| 1479 } | |
| 1480 | |
| 1481 /* | |
| 1482 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
| 1483 * literally ("literally" TRUE) or interpret is as typed characters. | |
| 1484 */ | |
| 1485 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1486 stuffescaped(char_u *arg, int literally) |
| 7 | 1487 { |
| 1488 int c; | |
| 1489 char_u *start; | |
| 1490 | |
| 1491 while (*arg != NUL) | |
| 1492 { | |
| 1493 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
| 1494 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
| 1495 * is TRUE. */ | |
| 1496 start = arg; | |
| 1497 while ((*arg >= ' ' | |
| 1498 #ifndef EBCDIC | |
| 1499 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
| 1500 #endif | |
| 1501 ) | |
| 1502 || (*arg == K_SPECIAL && !literally)) | |
| 1503 ++arg; | |
| 1504 if (arg > start) | |
| 1505 stuffReadbuffLen(start, (long)(arg - start)); | |
| 1506 | |
| 1507 /* stuff a single special character */ | |
| 1508 if (*arg != NUL) | |
| 1509 { | |
| 1510 #ifdef FEAT_MBYTE | |
| 1511 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
|
1512 c = mb_cptr2char_adv(&arg); |
| 7 | 1513 else |
| 1514 #endif | |
| 1515 c = *arg++; | |
| 1516 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
| 1517 stuffcharReadbuff(Ctrl_V); | |
| 1518 stuffcharReadbuff(c); | |
| 1519 } | |
| 1520 } | |
| 1521 } | |
| 1522 | |
| 1523 /* | |
| 1157 | 1524 * If "regname" is a special register, return TRUE and store a pointer to its |
| 1525 * value in "argp". | |
| 7 | 1526 */ |
| 15 | 1527 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1528 get_spec_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1529 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1530 char_u **argp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1531 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
|
1532 int errmsg) /* give error message when failing */ |
| 7 | 1533 { |
| 1534 int cnt; | |
| 1535 | |
| 1536 *argp = NULL; | |
| 1537 *allocated = FALSE; | |
| 1538 switch (regname) | |
| 1539 { | |
| 1540 case '%': /* file name */ | |
| 1541 if (errmsg) | |
| 1542 check_fname(); /* will give emsg if not set */ | |
| 1543 *argp = curbuf->b_fname; | |
| 1544 return TRUE; | |
| 1545 | |
| 1546 case '#': /* alternate file name */ | |
| 1547 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
| 1548 return TRUE; | |
| 1549 | |
| 1550 #ifdef FEAT_EVAL | |
| 1551 case '=': /* result of expression */ | |
| 1552 *argp = get_expr_line(); | |
| 1553 *allocated = TRUE; | |
| 1554 return TRUE; | |
| 1555 #endif | |
| 1556 | |
| 1557 case ':': /* last command line */ | |
| 1558 if (last_cmdline == NULL && errmsg) | |
| 1559 EMSG(_(e_nolastcmd)); | |
| 1560 *argp = last_cmdline; | |
| 1561 return TRUE; | |
| 1562 | |
| 1563 case '/': /* last search-pattern */ | |
| 1564 if (last_search_pat() == NULL && errmsg) | |
| 1565 EMSG(_(e_noprevre)); | |
| 1566 *argp = last_search_pat(); | |
| 1567 return TRUE; | |
| 1568 | |
| 1569 case '.': /* last inserted text */ | |
| 1570 *argp = get_last_insert_save(); | |
| 1571 *allocated = TRUE; | |
| 1572 if (*argp == NULL && errmsg) | |
| 1573 EMSG(_(e_noinstext)); | |
| 1574 return TRUE; | |
| 1575 | |
| 1576 #ifdef FEAT_SEARCHPATH | |
| 1577 case Ctrl_F: /* Filename under cursor */ | |
| 1578 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 1579 if (!errmsg) | |
| 1580 return FALSE; | |
| 1581 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
| 681 | 1582 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
| 7 | 1583 *allocated = TRUE; |
| 1584 return TRUE; | |
| 1585 #endif | |
| 1586 | |
| 1587 case Ctrl_W: /* word under cursor */ | |
| 1588 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 1589 if (!errmsg) | |
| 1590 return FALSE; | |
| 1591 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
| 1592 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
| 1593 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
| 1594 *allocated = TRUE; | |
| 1595 return TRUE; | |
| 1596 | |
|
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1597 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
|
1598 if (!errmsg) |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1599 return FALSE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1600 |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1601 *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
|
1602 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
|
1603 return TRUE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1604 |
| 7 | 1605 case '_': /* black hole: always empty */ |
| 1606 *argp = (char_u *)""; | |
| 1607 return TRUE; | |
| 1608 } | |
| 1609 | |
| 1610 return FALSE; | |
| 1611 } | |
| 1612 | |
| 1613 /* | |
| 15 | 1614 * Paste a yank register into the command line. |
| 1615 * Only for non-special registers. | |
| 1616 * Used by CTRL-R command in command-line mode | |
| 7 | 1617 * insert_reg() can't be used here, because special characters from the |
| 1618 * register contents will be interpreted as commands. | |
| 1619 * | |
| 1620 * return FAIL for failure, OK otherwise | |
| 1621 */ | |
| 1622 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1623 cmdline_paste_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1624 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
|
1625 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
|
1626 int remcr) /* don't add CR characters */ |
| 7 | 1627 { |
| 1628 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
|
1629 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
|
1630 |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1631 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
|
1632 literally = TRUE; |
| 7 | 1633 if (y_current->y_array == NULL) |
| 1634 return FAIL; | |
| 1635 | |
| 1636 for (i = 0; i < y_current->y_size; ++i) | |
| 1637 { | |
| 1638 cmdline_paste_str(y_current->y_array[i], literally); | |
| 1639 | |
| 1015 | 1640 /* 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
|
1641 * 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
|
1642 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
| 7 | 1643 cmdline_paste_str((char_u *)"\r", literally); |
| 1644 | |
| 1645 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
| 1646 * lines and gets bored. */ | |
| 1647 ui_breakcheck(); | |
| 1648 if (got_int) | |
| 1649 return FAIL; | |
| 1650 } | |
| 1651 return OK; | |
| 1652 } | |
| 1653 | |
| 1654 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 1655 /* | |
| 1656 * Adjust the register name pointed to with "rp" for the clipboard being | |
| 1657 * used always and the clipboard being available. | |
| 1658 */ | |
| 1659 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1660 adjust_clip_reg(int *rp) |
| 7 | 1661 { |
| 2654 | 1662 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
| 1663 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
| 6116 | 1664 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
| 1665 { | |
| 1666 if (clip_unnamed != 0) | |
| 1667 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 2654 | 1668 ? '+' : '*'; |
| 6116 | 1669 else |
| 1670 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 1671 ? '+' : '*'; | |
| 1672 } | |
| 7 | 1673 if (!clip_star.available && *rp == '*') |
| 1674 *rp = 0; | |
| 1675 if (!clip_plus.available && *rp == '+') | |
| 1676 *rp = 0; | |
| 1677 } | |
| 1678 #endif | |
| 1679 | |
| 1680 /* | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1681 * 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
|
1682 */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1683 void |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1684 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
|
1685 { |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1686 int n; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1687 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1688 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
|
1689 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
|
1690 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
|
1691 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
|
1692 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
|
1693 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
|
1694 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
|
1695 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
|
1696 } |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1697 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1698 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 static void |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 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
|
1701 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 static int recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1703 dict_T *v_event; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1704 list_T *list; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1705 int n; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 char_u buf[NUMBUFLEN + 2]; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1707 long reglen = 0; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1708 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 if (recursive) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1710 return; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 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
|
1713 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 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
|
1715 if (list == NULL) |
|
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1716 return; |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 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
|
1718 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
|
1719 list->lv_lock = VAR_FIXED; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 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
|
1721 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1722 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
|
1723 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
|
1724 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
|
1725 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1726 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
|
1727 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
|
1728 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
|
1729 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
|
1730 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 buf[0] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 buf[1] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 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
|
1734 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1735 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
|
1736 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
|
1737 case MBLOCK: |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1738 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
|
1739 reglen + 1); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1740 break; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1741 } |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1742 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
|
1743 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1744 /* 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
|
1745 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
|
1746 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1747 recursive = TRUE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1748 textlock++; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1749 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
|
1750 textlock--; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1751 recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1752 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1753 /* 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
|
1754 dict_free_contents(v_event); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1755 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
|
1756 } |
|
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1757 #endif |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1758 |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1759 /* |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1760 * Handle a delete operation. |
| 7 | 1761 * |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1762 * Return FAIL if undo failed, OK otherwise. |
| 7 | 1763 */ |
| 1764 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1765 op_delete(oparg_T *oap) |
| 7 | 1766 { |
| 1767 int n; | |
| 1768 linenr_T lnum; | |
| 1769 char_u *ptr; | |
| 1770 char_u *newp, *oldp; | |
| 1771 struct block_def bd; | |
| 1772 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 1773 int did_yank = FALSE; | |
| 3782 | 1774 int orig_regname = oap->regname; |
| 7 | 1775 |
| 1776 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
| 1777 return OK; | |
| 1778 | |
| 1779 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
| 1780 if (oap->empty) | |
| 1781 return u_save_cursor(); | |
| 1782 | |
| 1783 if (!curbuf->b_p_ma) | |
| 1784 { | |
| 1785 EMSG(_(e_modifiable)); | |
| 1786 return FAIL; | |
| 1787 } | |
| 1788 | |
| 1789 #ifdef FEAT_CLIPBOARD | |
| 1790 adjust_clip_reg(&oap->regname); | |
| 1791 #endif | |
| 1792 | |
| 1793 #ifdef FEAT_MBYTE | |
| 1794 if (has_mbyte) | |
| 1795 mb_adjust_opend(oap); | |
| 1796 #endif | |
| 1797 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1798 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1799 * 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
|
1800 * 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
|
1801 * 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
|
1802 */ |
| 7 | 1803 if ( oap->motion_type == MCHAR |
| 1804 && !oap->is_VIsual | |
| 50 | 1805 && !oap->block_mode |
| 7 | 1806 && oap->line_count > 1 |
| 3254 | 1807 && oap->motion_force == NUL |
| 7 | 1808 && oap->op_type == OP_DELETE) |
| 1809 { | |
| 2957 | 1810 ptr = ml_get(oap->end.lnum) + oap->end.col; |
| 1811 if (*ptr != NUL) | |
| 1812 ptr += oap->inclusive; | |
| 7 | 1813 ptr = skipwhite(ptr); |
| 1814 if (*ptr == NUL && inindent(0)) | |
| 1815 oap->motion_type = MLINE; | |
| 1816 } | |
| 1817 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1818 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1819 * 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
|
1820 * 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
|
1821 */ |
| 7 | 1822 if ( oap->motion_type == MCHAR |
| 1823 && oap->line_count == 1 | |
| 1824 && oap->op_type == OP_DELETE | |
| 1825 && *ml_get(oap->start.lnum) == NUL) | |
| 1826 { | |
| 1827 /* | |
| 446 | 1828 * It's an error to operate on an empty region, when 'E' included in |
| 7 | 1829 * 'cpoptions' (Vi compatible). |
| 1830 */ | |
| 446 | 1831 #ifdef FEAT_VIRTUALEDIT |
| 1832 if (virtual_op) | |
| 1833 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
| 1834 * marks as if it happened. */ | |
| 1835 goto setmarks; | |
| 1836 #endif | |
| 7 | 1837 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
| 1838 beep_flush(); | |
| 1839 return OK; | |
| 1840 } | |
| 1841 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1842 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1843 * 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
|
1844 * 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
|
1845 * 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
|
1846 */ |
| 7 | 1847 if (oap->regname != '_') |
| 1848 { | |
| 1849 if (oap->regname != 0) | |
| 1850 { | |
| 1851 /* check for read-only register */ | |
| 1852 if (!valid_yank_reg(oap->regname, TRUE)) | |
| 1853 { | |
| 1854 beep_flush(); | |
| 1855 return OK; | |
| 1856 } | |
| 1857 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
| 1858 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
| 1859 did_yank = TRUE; | |
| 1860 } | |
| 1861 | |
| 1862 /* | |
| 1863 * Put deleted text into register 1 and shift number registers if the | |
| 1864 * delete contains a line break, or when a regname has been specified. | |
| 3782 | 1865 * Use the register name from before adjust_clip_reg() may have |
| 1866 * changed it. | |
| 7 | 1867 */ |
| 3782 | 1868 if (orig_regname != 0 || oap->motion_type == MLINE |
| 7 | 1869 || oap->line_count > 1 || oap->use_reg_one) |
| 1870 { | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1871 shift_delete_registers(); |
| 7 | 1872 if (op_yank(oap, TRUE, FALSE) == OK) |
| 1873 did_yank = TRUE; | |
| 1874 } | |
| 1875 | |
| 3468 | 1876 /* Yank into small delete register when no named register specified |
| 1877 * and the delete is within one line. */ | |
| 1878 if (( | |
| 1879 #ifdef FEAT_CLIPBOARD | |
| 3584 | 1880 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
| 1881 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
| 3468 | 1882 #endif |
| 1883 oap->regname == 0) && oap->motion_type != MLINE | |
| 7 | 1884 && oap->line_count == 1) |
| 1885 { | |
| 1886 oap->regname = '-'; | |
| 1887 get_yank_register(oap->regname, TRUE); | |
| 1888 if (op_yank(oap, TRUE, FALSE) == OK) | |
| 1889 did_yank = TRUE; | |
| 1890 oap->regname = 0; | |
| 1891 } | |
| 1892 | |
| 1893 /* | |
| 1894 * If there's too much stuff to fit in the yank register, then get a | |
| 1895 * confirmation before doing the delete. This is crude, but simple. | |
| 1896 * And it avoids doing a delete of something we can't put back if we | |
| 1897 * want. | |
| 1898 */ | |
| 1899 if (!did_yank) | |
| 1900 { | |
| 1901 int msg_silent_save = msg_silent; | |
| 1902 | |
| 1903 msg_silent = 0; /* must display the prompt */ | |
| 1904 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
| 1905 msg_silent = msg_silent_save; | |
| 1906 if (n != 'y') | |
| 1907 { | |
| 1908 EMSG(_(e_abort)); | |
| 1909 return FAIL; | |
| 1910 } | |
| 1911 } | |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1912 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1913 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1914 if (did_yank && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1915 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
|
1916 #endif |
| 7 | 1917 } |
| 1918 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1919 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1920 * 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
|
1921 */ |
| 7 | 1922 if (oap->block_mode) |
| 1923 { | |
| 1924 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 1925 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1926 return FAIL; | |
| 1927 | |
| 1928 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
| 1929 { | |
| 1930 block_prep(oap, &bd, lnum, TRUE); | |
| 1931 if (bd.textlen == 0) /* nothing to delete */ | |
| 1932 continue; | |
| 1933 | |
| 1934 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
| 1935 if (lnum == curwin->w_cursor.lnum) | |
| 1936 { | |
| 1937 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
| 1938 # ifdef FEAT_VIRTUALEDIT | |
| 1939 curwin->w_cursor.coladd = 0; | |
| 1940 # endif | |
| 1941 } | |
| 1942 | |
| 1943 /* n == number of chars deleted | |
| 1944 * If we delete a TAB, it may be replaced by several characters. | |
| 1945 * Thus the number of characters may increase! | |
| 1946 */ | |
| 1947 n = bd.textlen - bd.startspaces - bd.endspaces; | |
| 1948 oldp = ml_get(lnum); | |
| 1949 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
| 1950 if (newp == NULL) | |
| 1951 continue; | |
| 1952 /* copy up to deleted part */ | |
| 1953 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 1954 /* insert spaces */ | |
| 6929 | 1955 vim_memset(newp + bd.textcol, ' ', |
| 7 | 1956 (size_t)(bd.startspaces + bd.endspaces)); |
| 1957 /* copy the part after the deleted part */ | |
| 1958 oldp += bd.textcol + bd.textlen; | |
| 1622 | 1959 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
| 7 | 1960 /* replace the line */ |
| 1961 ml_replace(lnum, newp, FALSE); | |
| 1962 } | |
| 1963 | |
| 1964 check_cursor_col(); | |
| 1965 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1966 oap->end.lnum + 1, 0L); | |
| 1967 oap->line_count = 0; /* no lines deleted */ | |
| 1968 } | |
| 5735 | 1969 else if (oap->motion_type == MLINE) |
| 7 | 1970 { |
| 1971 if (oap->op_type == OP_CHANGE) | |
| 1972 { | |
| 1973 /* Delete the lines except the first one. Temporarily move the | |
| 1974 * cursor to the next line. Save the current line number, if the | |
| 1975 * last line is deleted it may be changed. | |
| 1976 */ | |
| 1977 if (oap->line_count > 1) | |
| 1978 { | |
| 1979 lnum = curwin->w_cursor.lnum; | |
| 1980 ++curwin->w_cursor.lnum; | |
| 1981 del_lines((long)(oap->line_count - 1), TRUE); | |
| 1982 curwin->w_cursor.lnum = lnum; | |
| 1983 } | |
| 1984 if (u_save_cursor() == FAIL) | |
| 1985 return FAIL; | |
| 1986 if (curbuf->b_p_ai) /* don't delete indent */ | |
| 1987 { | |
| 1988 beginline(BL_WHITE); /* cursor on first non-white */ | |
| 1989 did_ai = TRUE; /* delete the indent when ESC hit */ | |
| 1990 ai_col = curwin->w_cursor.col; | |
| 1991 } | |
| 1992 else | |
| 1993 beginline(0); /* cursor in column 0 */ | |
| 1994 truncate_line(FALSE); /* delete the rest of the line */ | |
| 1995 /* leave cursor past last char in line */ | |
| 1996 if (oap->line_count > 1) | |
| 1997 u_clearline(); /* "U" command not possible after "2cc" */ | |
| 1998 } | |
| 1999 else | |
| 2000 { | |
| 2001 del_lines(oap->line_count, TRUE); | |
| 2002 beginline(BL_WHITE | BL_FIX); | |
| 2003 u_clearline(); /* "U" command not possible after "dd" */ | |
| 2004 } | |
| 2005 } | |
| 2006 else | |
| 2007 { | |
| 2008 #ifdef FEAT_VIRTUALEDIT | |
| 2009 if (virtual_op) | |
| 2010 { | |
| 2011 int endcol = 0; | |
| 2012 | |
| 2013 /* For virtualedit: break the tabs that are partly included. */ | |
| 2014 if (gchar_pos(&oap->start) == '\t') | |
| 2015 { | |
| 2016 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
| 2017 return FAIL; | |
| 2018 if (oap->line_count == 1) | |
| 2019 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
| 2020 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
| 2021 oap->start = curwin->w_cursor; | |
| 2022 if (oap->line_count == 1) | |
| 2023 { | |
| 2024 coladvance(endcol); | |
| 2025 oap->end.col = curwin->w_cursor.col; | |
| 2026 oap->end.coladd = curwin->w_cursor.coladd; | |
| 2027 curwin->w_cursor = oap->start; | |
| 2028 } | |
| 2029 } | |
| 2030 | |
| 2031 /* Break a tab only when it's included in the area. */ | |
| 2032 if (gchar_pos(&oap->end) == '\t' | |
| 2033 && (int)oap->end.coladd < oap->inclusive) | |
| 2034 { | |
| 2035 /* save last line for undo */ | |
| 2036 if (u_save((linenr_T)(oap->end.lnum - 1), | |
| 2037 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2038 return FAIL; | |
| 2039 curwin->w_cursor = oap->end; | |
| 2040 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
| 2041 oap->end = curwin->w_cursor; | |
| 2042 curwin->w_cursor = oap->start; | |
| 2043 } | |
| 2044 } | |
| 2045 #endif | |
| 2046 | |
| 2047 if (oap->line_count == 1) /* delete characters within one line */ | |
| 2048 { | |
| 2049 if (u_save_cursor() == FAIL) /* save line for undo */ | |
| 2050 return FAIL; | |
| 2051 | |
| 2052 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
| 5735 | 2053 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
| 7 | 2054 && oap->op_type == OP_CHANGE |
| 2055 && oap->end.lnum == curwin->w_cursor.lnum | |
| 5735 | 2056 && !oap->is_VIsual) |
| 7 | 2057 display_dollar(oap->end.col - !oap->inclusive); |
| 2058 | |
| 2059 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
| 2060 | |
| 2061 #ifdef FEAT_VIRTUALEDIT | |
| 2062 if (virtual_op) | |
| 2063 { | |
| 2064 /* fix up things for virtualedit-delete: | |
| 2065 * break the tabs which are going to get in our way | |
| 2066 */ | |
| 2067 char_u *curline = ml_get_curline(); | |
| 2068 int len = (int)STRLEN(curline); | |
| 2069 | |
| 2070 if (oap->end.coladd != 0 | |
| 2071 && (int)oap->end.col >= len - 1 | |
| 2072 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
| 2073 n++; | |
| 2074 /* Delete at least one char (e.g, when on a control char). */ | |
| 2075 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
| 2076 n = 1; | |
| 2077 | |
| 2078 /* When deleted a char in the line, reset coladd. */ | |
| 2079 if (gchar_cursor() != NUL) | |
| 2080 curwin->w_cursor.coladd = 0; | |
| 2081 } | |
| 2082 #endif | |
| 6826 | 2083 (void)del_bytes((long)n, !virtual_op, |
| 2084 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 7 | 2085 } |
| 2086 else /* delete characters between lines */ | |
| 2087 { | |
| 2088 pos_T curpos; | |
| 2089 | |
| 2090 /* save deleted and changed lines for undo */ | |
| 2091 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
| 2092 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
| 2093 return FAIL; | |
| 2094 | |
| 2095 truncate_line(TRUE); /* delete from cursor to end of line */ | |
| 2096 | |
| 2097 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
| 2098 ++curwin->w_cursor.lnum; | |
| 2099 del_lines((long)(oap->line_count - 2), FALSE); | |
| 2100 | |
| 6826 | 2101 /* delete from start of line until op_end */ |
| 2957 | 2102 n = (oap->end.col + 1 - !oap->inclusive); |
| 6826 | 2103 curwin->w_cursor.col = 0; |
| 2104 (void)del_bytes((long)n, !virtual_op, | |
| 2105 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 2106 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
| 2107 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
| 7 | 2108 } |
| 2109 } | |
| 2110 | |
| 2111 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
| 2112 | |
| 446 | 2113 #ifdef FEAT_VIRTUALEDIT |
| 2114 setmarks: | |
| 2115 #endif | |
| 7 | 2116 if (oap->block_mode) |
| 2117 { | |
| 2118 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 2119 curbuf->b_op_end.col = oap->start.col; | |
| 2120 } | |
| 2121 else | |
| 2122 curbuf->b_op_end = oap->start; | |
| 2123 curbuf->b_op_start = oap->start; | |
| 2124 | |
| 2125 return OK; | |
| 2126 } | |
| 2127 | |
| 2128 #ifdef FEAT_MBYTE | |
| 2129 /* | |
| 2130 * Adjust end of operating area for ending on a multi-byte character. | |
| 2131 * Used for deletion. | |
| 2132 */ | |
| 2133 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2134 mb_adjust_opend(oparg_T *oap) |
| 7 | 2135 { |
| 2136 char_u *p; | |
| 2137 | |
| 2138 if (oap->inclusive) | |
| 2139 { | |
| 2140 p = ml_get(oap->end.lnum); | |
| 2141 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
| 2142 } | |
| 2143 } | |
| 2144 #endif | |
| 2145 | |
| 2146 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2147 |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2148 # ifdef FEAT_MBYTE |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2149 /* |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2150 * 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
|
2151 * 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
|
2152 */ |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2153 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
|
2154 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
|
2155 { |
|
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
|
2156 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
|
2157 |
|
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
|
2158 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
|
2159 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
|
2160 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
|
2161 /* 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
|
2162 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
|
2163 } |
|
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
|
2164 |
|
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
|
2165 # endif |
| 7 | 2166 /* |
| 2167 * Replace a whole area with one character. | |
| 2168 */ | |
| 2169 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2170 op_replace(oparg_T *oap, int c) |
| 7 | 2171 { |
| 2172 int n, numc; | |
| 2173 #ifdef FEAT_MBYTE | |
| 2174 int num_chars; | |
| 2175 #endif | |
| 2176 char_u *newp, *oldp; | |
| 2177 size_t oldlen; | |
| 2178 struct block_def bd; | |
| 5428 | 2179 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
|
2180 int had_ctrl_v_cr = FALSE; |
| 7 | 2181 |
| 2182 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
| 2183 return OK; /* nothing to do */ | |
| 2184 | |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2185 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
|
2186 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2187 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
|
2188 c = CAR; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2189 } |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2190 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
|
2191 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2192 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
|
2193 c = NL; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2194 } |
| 5428 | 2195 |
| 7 | 2196 #ifdef FEAT_MBYTE |
| 2197 if (has_mbyte) | |
| 2198 mb_adjust_opend(oap); | |
| 2199 #endif | |
| 2200 | |
| 2201 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2202 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2203 return FAIL; | |
| 2204 | |
| 2205 /* | |
| 2206 * block mode replace | |
| 2207 */ | |
| 2208 if (oap->block_mode) | |
| 2209 { | |
| 2210 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2211 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
| 2212 { | |
| 1982 | 2213 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
| 7 | 2214 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
| 2215 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
| 2216 continue; /* nothing to replace */ | |
| 2217 | |
| 2218 /* n == number of extra chars required | |
| 2219 * If we split a TAB, it may be replaced by several characters. | |
| 2220 * Thus the number of characters may increase! | |
| 2221 */ | |
| 2222 #ifdef FEAT_VIRTUALEDIT | |
| 2223 /* If the range starts in virtual space, count the initial | |
| 2224 * coladd offset as part of "startspaces" */ | |
| 2225 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
| 2226 { | |
| 2227 pos_T vpos; | |
| 2228 | |
| 1982 | 2229 vpos.lnum = curwin->w_cursor.lnum; |
| 7 | 2230 getvpos(&vpos, oap->start_vcol); |
| 2231 bd.startspaces += vpos.coladd; | |
| 2232 n = bd.startspaces; | |
| 2233 } | |
| 2234 else | |
| 2235 #endif | |
| 2236 /* allow for pre spaces */ | |
| 2237 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
| 2238 | |
| 2239 /* allow for post spp */ | |
| 2240 n += (bd.endspaces | |
| 2241 #ifdef FEAT_VIRTUALEDIT | |
| 2242 && !bd.is_oneChar | |
| 2243 #endif | |
| 2244 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
| 2245 /* Figure out how many characters to replace. */ | |
| 2246 numc = oap->end_vcol - oap->start_vcol + 1; | |
| 2247 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
| 2248 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
| 2249 | |
| 2250 #ifdef FEAT_MBYTE | |
| 2251 /* A double-wide character can be replaced only up to half the | |
| 2252 * times. */ | |
| 2253 if ((*mb_char2cells)(c) > 1) | |
| 2254 { | |
| 2255 if ((numc & 1) && !bd.is_short) | |
| 2256 { | |
| 2257 ++bd.endspaces; | |
| 2258 ++n; | |
| 2259 } | |
| 2260 numc = numc / 2; | |
| 2261 } | |
| 2262 | |
| 2263 /* Compute bytes needed, move character count to num_chars. */ | |
| 2264 num_chars = numc; | |
| 2265 numc *= (*mb_char2len)(c); | |
| 2266 #endif | |
| 2267 /* oldlen includes textlen, so don't double count */ | |
| 2268 n += numc - bd.textlen; | |
| 2269 | |
| 2270 oldp = ml_get_curline(); | |
| 2271 oldlen = STRLEN(oldp); | |
| 2272 newp = alloc_check((unsigned)oldlen + 1 + n); | |
| 2273 if (newp == NULL) | |
| 2274 continue; | |
| 2275 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
| 2276 /* copy up to deleted part */ | |
| 2277 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2278 oldp += bd.textcol + bd.textlen; | |
| 2279 /* insert pre-spaces */ | |
| 6929 | 2280 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
| 7 | 2281 /* 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
|
2282 /* 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
|
2283 * literally. */ |
| 5428 | 2284 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
| 7 | 2285 { |
| 5428 | 2286 #ifdef FEAT_MBYTE |
| 2287 if (has_mbyte) | |
| 2288 { | |
| 2289 n = (int)STRLEN(newp); | |
| 2290 while (--num_chars >= 0) | |
| 2291 n += (*mb_char2bytes)(c, newp + n); | |
| 2292 } | |
| 2293 else | |
| 2294 #endif | |
| 6929 | 2295 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
| 5428 | 2296 if (!bd.is_short) |
| 2297 { | |
| 2298 /* insert post-spaces */ | |
| 6929 | 2299 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
| 5428 | 2300 /* copy the part after the changed part */ |
| 2301 STRMOVE(newp + STRLEN(newp), oldp); | |
| 2302 } | |
| 7 | 2303 } |
| 2304 else | |
| 2305 { | |
| 5428 | 2306 /* Replacing with \r or \n means splitting the line. */ |
| 5475 | 2307 after_p = alloc_check( |
| 2308 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
| 5428 | 2309 if (after_p != NULL) |
| 2310 STRMOVE(after_p, oldp); | |
| 7 | 2311 } |
| 2312 /* replace the line */ | |
| 2313 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 5428 | 2314 if (after_p != NULL) |
| 2315 { | |
| 2316 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
| 2317 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
| 2318 oap->end.lnum++; | |
| 2319 vim_free(after_p); | |
| 2320 } | |
| 7 | 2321 } |
| 2322 } | |
| 2323 else | |
| 2324 { | |
| 2325 /* | |
| 2326 * MCHAR and MLINE motion replace. | |
| 2327 */ | |
| 2328 if (oap->motion_type == MLINE) | |
| 2329 { | |
| 2330 oap->start.col = 0; | |
| 2331 curwin->w_cursor.col = 0; | |
| 2332 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2333 if (oap->end.col) | |
| 2334 --oap->end.col; | |
| 2335 } | |
| 2336 else if (!oap->inclusive) | |
| 2337 dec(&(oap->end)); | |
| 2338 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2339 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
| 7 | 2340 { |
| 2341 n = gchar_cursor(); | |
| 2342 if (n != NUL) | |
| 2343 { | |
| 2344 #ifdef FEAT_MBYTE | |
| 2345 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
| 2346 { | |
| 2347 /* This is slow, but it handles replacing a single-byte | |
| 2348 * with a multi-byte and the other way around. */ | |
| 4203 | 2349 if (curwin->w_cursor.lnum == oap->end.lnum) |
| 2350 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
|
2351 replace_character(c); |
| 7 | 2352 } |
| 2353 else | |
| 2354 #endif | |
| 2355 { | |
| 2356 #ifdef FEAT_VIRTUALEDIT | |
| 2357 if (n == TAB) | |
| 2358 { | |
| 2359 int end_vcol = 0; | |
| 2360 | |
| 2361 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2362 { | |
| 2363 /* oap->end has to be recalculated when | |
| 2364 * the tab breaks */ | |
| 2365 end_vcol = getviscol2(oap->end.col, | |
| 2366 oap->end.coladd); | |
| 2367 } | |
| 2368 coladvance_force(getviscol()); | |
| 2369 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2370 getvpos(&oap->end, end_vcol); | |
| 2371 } | |
| 2372 #endif | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2373 PBYTE(curwin->w_cursor, c); |
| 7 | 2374 } |
| 2375 } | |
| 2376 #ifdef FEAT_VIRTUALEDIT | |
| 2377 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
| 2378 { | |
| 2379 int virtcols = oap->end.coladd; | |
| 2380 | |
| 2381 if (curwin->w_cursor.lnum == oap->start.lnum | |
| 2382 && oap->start.col == oap->end.col && oap->start.coladd) | |
| 2383 virtcols -= oap->start.coladd; | |
| 2384 | |
| 2385 /* oap->end has been trimmed so it's effectively inclusive; | |
| 2386 * as a result an extra +1 must be counted so we don't | |
| 2387 * trample the NUL byte. */ | |
| 2388 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
| 2389 curwin->w_cursor.col -= (virtcols + 1); | |
| 2390 for (; virtcols >= 0; virtcols--) | |
| 2391 { | |
|
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
|
2392 #ifdef FEAT_MBYTE |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2393 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
|
2394 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
|
2395 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
|
2396 #endif |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2397 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
|
2398 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
|
2399 break; |
| 7 | 2400 } |
| 2401 } | |
| 2402 #endif | |
| 2403 | |
| 2404 /* Advance to next character, stop at the end of the file. */ | |
| 2405 if (inc_cursor() == -1) | |
| 2406 break; | |
| 2407 } | |
| 2408 } | |
| 2409 | |
| 2410 curwin->w_cursor = oap->start; | |
| 2411 check_cursor(); | |
| 2412 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
| 2413 | |
| 2414 /* Set "'[" and "']" marks. */ | |
| 2415 curbuf->b_op_start = oap->start; | |
| 2416 curbuf->b_op_end = oap->end; | |
| 2417 | |
| 2418 return OK; | |
| 2419 } | |
| 2420 #endif | |
| 2421 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2422 static int swapchars(int op_type, pos_T *pos, int length); |
| 1525 | 2423 |
| 7 | 2424 /* |
| 2425 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
| 2426 */ | |
| 2427 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2428 op_tilde(oparg_T *oap) |
| 7 | 2429 { |
| 2430 pos_T pos; | |
| 2431 struct block_def bd; | |
| 1528 | 2432 int did_change = FALSE; |
| 7 | 2433 |
| 2434 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2435 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2436 return; | |
| 2437 | |
| 2438 pos = oap->start; | |
| 2439 if (oap->block_mode) /* Visual block mode */ | |
| 2440 { | |
| 2441 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
| 2442 { | |
| 1766 | 2443 int one_change; |
| 2444 | |
| 7 | 2445 block_prep(oap, &bd, pos.lnum, FALSE); |
| 2446 pos.col = bd.textcol; | |
| 1766 | 2447 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
| 2448 did_change |= one_change; | |
| 1525 | 2449 |
| 5735 | 2450 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 2451 if (netbeans_active() && one_change) |
| 7 | 2452 { |
| 2453 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2454 | |
| 33 | 2455 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
| 2456 (long)bd.textlen); | |
| 7 | 2457 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
| 2210 | 2458 &ptr[bd.textcol], bd.textlen); |
| 7 | 2459 } |
| 5735 | 2460 #endif |
| 7 | 2461 } |
| 2462 if (did_change) | |
| 2463 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 2464 } | |
| 2465 else /* not block mode */ | |
| 2466 { | |
| 2467 if (oap->motion_type == MLINE) | |
| 2468 { | |
| 2469 oap->start.col = 0; | |
| 2470 pos.col = 0; | |
| 2471 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2472 if (oap->end.col) | |
| 2473 --oap->end.col; | |
| 2474 } | |
| 2475 else if (!oap->inclusive) | |
| 2476 dec(&(oap->end)); | |
| 2477 | |
| 1528 | 2478 if (pos.lnum == oap->end.lnum) |
| 2479 did_change = swapchars(oap->op_type, &pos, | |
| 2480 oap->end.col - pos.col + 1); | |
| 2481 else | |
| 2482 for (;;) | |
| 2483 { | |
| 2484 did_change |= swapchars(oap->op_type, &pos, | |
| 2485 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
| 2486 (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
|
2487 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
| 1528 | 2488 break; |
| 2489 } | |
| 7 | 2490 if (did_change) |
| 2491 { | |
| 2492 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
| 2493 0L); | |
| 2494 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2495 if (netbeans_active() && did_change) |
| 7 | 2496 { |
| 2497 char_u *ptr; | |
| 2498 int count; | |
| 2499 | |
| 2500 pos = oap->start; | |
| 2501 while (pos.lnum < oap->end.lnum) | |
| 2502 { | |
| 2503 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 835 | 2504 count = (int)STRLEN(ptr) - pos.col; |
| 33 | 2505 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2506 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2507 &ptr[pos.col], count); |
| 7 | 2508 pos.col = 0; |
| 2509 pos.lnum++; | |
| 2510 } | |
| 2511 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2512 count = oap->end.col - pos.col + 1; | |
| 33 | 2513 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2514 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2515 &ptr[pos.col], count); |
| 7 | 2516 } |
| 2517 #endif | |
| 2518 } | |
| 2519 } | |
| 2520 | |
| 2521 if (!did_change && oap->is_VIsual) | |
| 2522 /* No change: need to remove the Visual selection */ | |
| 2523 redraw_curbuf_later(INVERTED); | |
| 2524 | |
| 2525 /* | |
| 2526 * Set '[ and '] marks. | |
| 2527 */ | |
| 2528 curbuf->b_op_start = oap->start; | |
| 2529 curbuf->b_op_end = oap->end; | |
| 2530 | |
| 2531 if (oap->line_count > p_report) | |
| 2532 { | |
| 2533 if (oap->line_count == 1) | |
| 2534 MSG(_("1 line changed")); | |
| 2535 else | |
| 2536 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
| 2537 } | |
| 2538 } | |
| 2539 | |
| 2540 /* | |
| 1525 | 2541 * Invoke swapchar() on "length" bytes at position "pos". |
| 2542 * "pos" is advanced to just after the changed characters. | |
| 2543 * "length" is rounded up to include the whole last multi-byte character. | |
| 2544 * Also works correctly when the number of bytes changes. | |
| 2545 * Returns TRUE if some character was changed. | |
| 2546 */ | |
| 2547 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2548 swapchars(int op_type, pos_T *pos, int length) |
| 1525 | 2549 { |
| 2550 int todo; | |
| 2551 int did_change = 0; | |
| 2552 | |
| 2553 for (todo = length; todo > 0; --todo) | |
| 2554 { | |
| 2555 # ifdef FEAT_MBYTE | |
| 2556 if (has_mbyte) | |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2557 { |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2558 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2559 |
| 1525 | 2560 /* we're counting bytes, not characters */ |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2561 if (len > 0) |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2562 todo -= len - 1; |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2563 } |
| 1525 | 2564 # endif |
| 2565 did_change |= swapchar(op_type, pos); | |
| 2566 if (inc(pos) == -1) /* at end of file */ | |
| 2567 break; | |
| 2568 } | |
| 2569 return did_change; | |
| 2570 } | |
| 2571 | |
| 2572 /* | |
| 7 | 2573 * If op_type == OP_UPPER: make uppercase, |
| 2574 * if op_type == OP_LOWER: make lowercase, | |
| 2575 * if op_type == OP_ROT13: do rot13 encoding, | |
| 2576 * else swap case of character at 'pos' | |
| 2577 * returns TRUE when something actually changed. | |
| 2578 */ | |
| 2579 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2580 swapchar(int op_type, pos_T *pos) |
| 7 | 2581 { |
| 2582 int c; | |
| 2583 int nc; | |
| 2584 | |
| 2585 c = gchar_pos(pos); | |
| 2586 | |
| 2587 /* Only do rot13 encoding for ASCII characters. */ | |
| 2588 if (c >= 0x80 && op_type == OP_ROT13) | |
| 2589 return FALSE; | |
| 2590 | |
| 2591 #ifdef FEAT_MBYTE | |
| 1525 | 2592 if (op_type == OP_UPPER && c == 0xdf |
| 2593 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
| 493 | 2594 { |
| 2595 pos_T sp = curwin->w_cursor; | |
| 2596 | |
| 2597 /* Special handling of German sharp s: change to "SS". */ | |
| 2598 curwin->w_cursor = *pos; | |
| 2599 del_char(FALSE); | |
| 2600 ins_char('S'); | |
| 2601 ins_char('S'); | |
| 2602 curwin->w_cursor = sp; | |
| 2603 inc(pos); | |
| 2604 } | |
| 2605 | |
| 7 | 2606 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
| 2607 return FALSE; | |
| 2608 #endif | |
| 2609 nc = c; | |
| 2610 if (MB_ISLOWER(c)) | |
| 2611 { | |
| 2612 if (op_type == OP_ROT13) | |
| 2613 nc = ROT13(c, 'a'); | |
| 2614 else if (op_type != OP_LOWER) | |
| 2615 nc = MB_TOUPPER(c); | |
| 2616 } | |
| 2617 else if (MB_ISUPPER(c)) | |
| 2618 { | |
| 2619 if (op_type == OP_ROT13) | |
| 2620 nc = ROT13(c, 'A'); | |
| 2621 else if (op_type != OP_UPPER) | |
| 2622 nc = MB_TOLOWER(c); | |
| 2623 } | |
| 2624 if (nc != c) | |
| 2625 { | |
| 2626 #ifdef FEAT_MBYTE | |
| 2627 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
| 2628 { | |
| 2629 pos_T sp = curwin->w_cursor; | |
| 2630 | |
| 2631 curwin->w_cursor = *pos; | |
|
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2632 /* 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
|
2633 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
| 7 | 2634 ins_char(nc); |
| 2635 curwin->w_cursor = sp; | |
| 2636 } | |
| 2637 else | |
| 2638 #endif | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2639 PBYTE(*pos, nc); |
| 7 | 2640 return TRUE; |
| 2641 } | |
| 2642 return FALSE; | |
| 2643 } | |
| 2644 | |
| 2645 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 2646 /* | |
| 2647 * op_insert - Insert and append operators for Visual mode. | |
| 2648 */ | |
| 2649 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2650 op_insert(oparg_T *oap, long count1) |
| 7 | 2651 { |
| 2652 long ins_len, pre_textlen = 0; | |
| 2653 char_u *firstline, *ins_text; | |
|
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2654 colnr_T ind_pre = 0, ind_post; |
| 7 | 2655 struct block_def bd; |
| 2656 int i; | |
| 6579 | 2657 pos_T t1; |
| 7 | 2658 |
| 2659 /* edit() changes this - record it for OP_APPEND */ | |
| 2660 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2661 | |
| 2662 /* vis block is still marked. Get rid of it now. */ | |
| 2663 curwin->w_cursor.lnum = oap->start.lnum; | |
| 2664 update_screen(INVERTED); | |
| 2665 | |
| 2666 if (oap->block_mode) | |
| 2667 { | |
| 2668 #ifdef FEAT_VIRTUALEDIT | |
| 2669 /* When 'virtualedit' is used, need to insert the extra spaces before | |
| 2670 * doing block_prep(). When only "block" is used, virtual edit is | |
| 2671 * already disabled, but still need it when calling | |
| 2672 * coladvance_force(). */ | |
| 2673 if (curwin->w_cursor.coladd > 0) | |
| 2674 { | |
| 2675 int old_ve_flags = ve_flags; | |
| 2676 | |
| 2677 ve_flags = VE_ALL; | |
| 2678 if (u_save_cursor() == FAIL) | |
| 2679 return; | |
| 2680 coladvance_force(oap->op_type == OP_APPEND | |
| 2681 ? oap->end_vcol + 1 : getviscol()); | |
| 2682 if (oap->op_type == OP_APPEND) | |
| 2683 --curwin->w_cursor.col; | |
| 2684 ve_flags = old_ve_flags; | |
| 2685 } | |
| 2686 #endif | |
| 2687 /* Get the info about the block before entering the text */ | |
| 2688 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
|
2689 /* 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
|
2690 ind_pre = (colnr_T)getwhitecols_curline(); |
| 7 | 2691 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
|
2692 |
| 7 | 2693 if (oap->op_type == OP_APPEND) |
| 2694 firstline += bd.textlen; | |
| 2695 pre_textlen = (long)STRLEN(firstline); | |
| 2696 } | |
| 2697 | |
| 2698 if (oap->op_type == OP_APPEND) | |
| 2699 { | |
| 2700 if (oap->block_mode | |
| 2701 #ifdef FEAT_VIRTUALEDIT | |
| 2702 && curwin->w_cursor.coladd == 0 | |
| 2703 #endif | |
| 2704 ) | |
| 2705 { | |
| 2706 /* Move the cursor to the character right of the block. */ | |
| 2707 curwin->w_set_curswant = TRUE; | |
| 2708 while (*ml_get_cursor() != NUL | |
| 2709 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
| 2710 ++curwin->w_cursor.col; | |
| 2711 if (bd.is_short && !bd.is_MAX) | |
| 2712 { | |
| 2713 /* First line was too short, make it longer and adjust the | |
| 2714 * values in "bd". */ | |
| 2715 if (u_save_cursor() == FAIL) | |
| 2716 return; | |
| 2717 for (i = 0; i < bd.endspaces; ++i) | |
| 2718 ins_char(' '); | |
| 2719 bd.textlen += bd.endspaces; | |
| 2720 } | |
| 2721 } | |
| 2722 else | |
| 2723 { | |
| 2724 curwin->w_cursor = oap->end; | |
| 893 | 2725 check_cursor_col(); |
| 7 | 2726 |
| 2727 /* 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
|
2728 if (!LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2729 && oap->start_vcol != oap->end_vcol) |
| 2730 inc_cursor(); | |
| 2731 } | |
| 2732 } | |
| 2733 | |
| 6579 | 2734 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
|
2735 (void)edit(NUL, FALSE, (linenr_T)count1); |
| 7 | 2736 |
| 6579 | 2737 /* When a tab was inserted, and the characters in front of the tab |
| 2738 * have been converted to a tab as well, the column of the cursor | |
| 2739 * might have actually been reduced, so need to adjust here. */ | |
| 2740 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
|
2741 && LT_POS(curbuf->b_op_start_orig, t1)) |
| 6579 | 2742 oap->start = curbuf->b_op_start_orig; |
| 2743 | |
| 1477 | 2744 /* If user has moved off this line, we don't know what to do, so do |
| 2745 * nothing. | |
| 2746 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 2747 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 7 | 2748 return; |
| 2749 | |
| 2750 if (oap->block_mode) | |
| 2751 { | |
| 2752 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
|
2753 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
|
2754 size_t len; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2755 int add; |
| 7 | 2756 |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2757 /* 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
|
2758 * 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
|
2759 ind_post = (colnr_T)getwhitecols_curline(); |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2760 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
|
2761 { |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2762 bd.textcol += ind_post - ind_pre; |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2763 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
|
2764 did_indent = TRUE; |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2765 } |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2766 |
| 5471 | 2767 /* 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
|
2768 * 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
|
2769 * 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
|
2770 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
|
2771 && !bd.is_MAX && !did_indent) |
| 5471 | 2772 { |
| 2773 if (oap->op_type == OP_INSERT | |
| 5730 | 2774 && oap->start.col |
| 2775 #ifdef FEAT_VIRTUALEDIT | |
| 2776 + oap->start.coladd | |
| 2777 #endif | |
| 2778 != curbuf->b_op_start_orig.col | |
| 2779 #ifdef FEAT_VIRTUALEDIT | |
| 2780 + curbuf->b_op_start_orig.coladd | |
| 2781 #endif | |
| 2782 ) | |
| 5471 | 2783 { |
| 6579 | 2784 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2785 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2786 oap->start.col = curbuf->b_op_start_orig.col; |
| 6579 | 2787 pre_textlen -= t - oap->start_vcol; |
| 2788 oap->start_vcol = t; | |
| 5471 | 2789 } |
| 2790 else if (oap->op_type == OP_APPEND | |
| 5730 | 2791 && oap->end.col |
| 2792 #ifdef FEAT_VIRTUALEDIT | |
| 2793 + oap->end.coladd | |
| 2794 #endif | |
| 2795 >= curbuf->b_op_start_orig.col | |
| 2796 #ifdef FEAT_VIRTUALEDIT | |
| 2797 + curbuf->b_op_start_orig.coladd | |
| 2798 #endif | |
| 2799 ) | |
| 5471 | 2800 { |
| 6579 | 2801 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2802 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2803 oap->start.col = curbuf->b_op_start_orig.col; |
| 5471 | 2804 /* reset pre_textlen to the value of OP_INSERT */ |
| 2805 pre_textlen += bd.textlen; | |
| 6579 | 2806 pre_textlen -= t - oap->start_vcol; |
| 2807 oap->start_vcol = t; | |
| 5471 | 2808 oap->op_type = OP_INSERT; |
| 2809 } | |
| 2810 } | |
| 2811 | |
| 7 | 2812 /* |
| 2813 * Spaces and tabs in the indent may have changed to other spaces and | |
| 1392 | 2814 * tabs. Get the starting column again and correct the length. |
| 7 | 2815 * Don't do this when "$" used, end-of-line will have changed. |
| 2816 */ | |
| 2817 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
| 2818 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
| 2819 { | |
| 2820 if (oap->op_type == OP_APPEND) | |
| 2821 { | |
| 2822 pre_textlen += bd2.textlen - bd.textlen; | |
| 2823 if (bd2.endspaces) | |
| 2824 --bd2.textlen; | |
| 2825 } | |
| 2826 bd.textcol = bd2.textcol; | |
| 2827 bd.textlen = bd2.textlen; | |
| 2828 } | |
| 2829 | |
| 2830 /* | |
| 2831 * Subsequent calls to ml_get() flush the firstline data - take a | |
| 2832 * copy of the required string. | |
| 2833 */ | |
|
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2834 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
|
2835 len = STRLEN(firstline); |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2836 add = bd.textcol; |
| 7 | 2837 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
|
2838 add += bd.textlen; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2839 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
|
2840 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
|
2841 else |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2842 firstline += add; |
| 3421 | 2843 if (pre_textlen >= 0 |
| 2844 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
| 7 | 2845 { |
| 2846 ins_text = vim_strnsave(firstline, (int)ins_len); | |
| 2847 if (ins_text != NULL) | |
| 2848 { | |
| 2849 /* block handled here */ | |
| 2850 if (u_save(oap->start.lnum, | |
| 2851 (linenr_T)(oap->end.lnum + 1)) == OK) | |
| 2852 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
| 2853 &bd); | |
| 2854 | |
| 2855 curwin->w_cursor.col = oap->start.col; | |
| 2856 check_cursor(); | |
| 2857 vim_free(ins_text); | |
| 2858 } | |
| 2859 } | |
| 2860 } | |
| 2861 } | |
| 2862 #endif | |
| 2863 | |
| 2864 /* | |
| 2865 * op_change - handle a change operation | |
| 2866 * | |
| 2867 * return TRUE if edit() returns because of a CTRL-O command | |
| 2868 */ | |
| 2869 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2870 op_change(oparg_T *oap) |
| 7 | 2871 { |
| 2872 colnr_T l; | |
| 2873 int retval; | |
| 2874 #ifdef FEAT_VISUALEXTRA | |
| 2875 long offset; | |
| 2876 linenr_T linenr; | |
| 1392 | 2877 long ins_len; |
| 2878 long pre_textlen = 0; | |
| 2879 long pre_indent = 0; | |
| 7 | 2880 char_u *firstline; |
| 2881 char_u *ins_text, *newp, *oldp; | |
| 2882 struct block_def bd; | |
| 2883 #endif | |
| 2884 | |
| 2885 l = oap->start.col; | |
| 2886 if (oap->motion_type == MLINE) | |
| 2887 { | |
| 2888 l = 0; | |
| 2889 #ifdef FEAT_SMARTINDENT | |
| 2890 if (!p_paste && curbuf->b_p_si | |
| 2891 # ifdef FEAT_CINDENT | |
| 2892 && !curbuf->b_p_cin | |
| 2893 # endif | |
| 2894 ) | |
| 2895 can_si = TRUE; /* It's like opening a new line, do si */ | |
| 2896 #endif | |
| 2897 } | |
| 2898 | |
| 2899 /* First delete the text in the region. In an empty buffer only need to | |
| 2900 * save for undo */ | |
| 2901 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 2902 { | |
| 2903 if (u_save_cursor() == FAIL) | |
| 2904 return FALSE; | |
| 2905 } | |
| 2906 else if (op_delete(oap) == FAIL) | |
| 2907 return FALSE; | |
| 2908 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2909 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2910 && !virtual_op) |
| 2911 inc_cursor(); | |
| 2912 | |
| 2913 #ifdef FEAT_VISUALEXTRA | |
| 2914 /* check for still on same line (<CR> in inserted text meaningless) */ | |
| 2915 /* skip blank lines too */ | |
| 2916 if (oap->block_mode) | |
| 2917 { | |
| 2918 # ifdef FEAT_VIRTUALEDIT | |
| 2919 /* Add spaces before getting the current line length. */ | |
| 2920 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
| 2921 || gchar_cursor() == NUL)) | |
| 2922 coladvance_force(getviscol()); | |
| 2923 # endif | |
| 1392 | 2924 firstline = ml_get(oap->start.lnum); |
| 2925 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
|
2926 pre_indent = (long)getwhitecols(firstline); |
| 7 | 2927 bd.textcol = curwin->w_cursor.col; |
| 2928 } | |
| 2929 #endif | |
| 2930 | |
| 2931 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
| 2932 if (oap->motion_type == MLINE) | |
| 2933 fix_indent(); | |
| 2934 #endif | |
| 2935 | |
| 2936 retval = edit(NUL, FALSE, (linenr_T)1); | |
| 2937 | |
| 2938 #ifdef FEAT_VISUALEXTRA | |
| 2939 /* | |
| 39 | 2940 * In Visual block mode, handle copying the new text to all lines of the |
| 7 | 2941 * block. |
| 1477 | 2942 * Don't repeat the insert when Insert mode ended with CTRL-C. |
| 7 | 2943 */ |
| 1477 | 2944 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
| 7 | 2945 { |
| 1392 | 2946 /* Auto-indenting may have changed the indent. If the cursor was past |
| 2947 * the indent, exclude that indent change from the inserted text. */ | |
| 7 | 2948 firstline = ml_get(oap->start.lnum); |
| 1403 | 2949 if (bd.textcol > (colnr_T)pre_indent) |
| 7 | 2950 { |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2951 long new_indent = (long)getwhitecols(firstline); |
| 1392 | 2952 |
| 2953 pre_textlen += new_indent - pre_indent; | |
| 2954 bd.textcol += new_indent - pre_indent; | |
| 2955 } | |
| 2956 | |
| 2957 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
| 2958 if (ins_len > 0) | |
| 2959 { | |
| 2960 /* Subsequent calls to ml_get() flush the firstline data - take a | |
| 2961 * copy of the inserted text. */ | |
| 7 | 2962 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
| 2963 { | |
| 419 | 2964 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
| 7 | 2965 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
| 2966 linenr++) | |
| 2967 { | |
| 2968 block_prep(oap, &bd, linenr, TRUE); | |
| 2969 if (!bd.is_short || virtual_op) | |
| 2970 { | |
| 2971 # ifdef FEAT_VIRTUALEDIT | |
| 2972 pos_T vpos; | |
| 2973 | |
| 2974 /* If the block starts in virtual space, count the | |
| 2975 * initial coladd offset as part of "startspaces" */ | |
| 2976 if (bd.is_short) | |
| 2977 { | |
| 1982 | 2978 vpos.lnum = linenr; |
| 7 | 2979 (void)getvpos(&vpos, oap->start_vcol); |
| 2980 } | |
| 2981 else | |
| 2982 vpos.coladd = 0; | |
| 2983 # endif | |
| 2984 oldp = ml_get(linenr); | |
| 2985 newp = alloc_check((unsigned)(STRLEN(oldp) | |
| 2986 # ifdef FEAT_VIRTUALEDIT | |
| 2987 + vpos.coladd | |
| 2988 # endif | |
| 2989 + ins_len + 1)); | |
| 2990 if (newp == NULL) | |
| 2991 continue; | |
| 2992 /* copy up to block start */ | |
| 2993 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2994 offset = bd.textcol; | |
| 2995 # ifdef FEAT_VIRTUALEDIT | |
| 6929 | 2996 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
| 7 | 2997 offset += vpos.coladd; |
| 2998 # endif | |
| 2999 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
| 3000 offset += ins_len; | |
| 3001 oldp += bd.textcol; | |
| 1622 | 3002 STRMOVE(newp + offset, oldp); |
| 7 | 3003 ml_replace(linenr, newp, FALSE); |
| 3004 } | |
| 3005 } | |
| 3006 check_cursor(); | |
| 3007 | |
| 3008 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 3009 } | |
| 3010 vim_free(ins_text); | |
| 3011 } | |
| 3012 } | |
| 3013 #endif | |
| 3014 | |
| 3015 return retval; | |
| 3016 } | |
| 3017 | |
| 3018 /* | |
| 3019 * set all the yank registers to empty (called from main()) | |
| 3020 */ | |
| 3021 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3022 init_yank(void) |
| 7 | 3023 { |
| 3024 int i; | |
| 3025 | |
| 3026 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 3027 y_regs[i].y_array = NULL; | |
| 3028 } | |
| 3029 | |
| 356 | 3030 #if defined(EXITFREE) || defined(PROTO) |
| 3031 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3032 clear_registers(void) |
| 356 | 3033 { |
| 3034 int i; | |
| 3035 | |
| 3036 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 3037 { | |
| 3038 y_current = &y_regs[i]; | |
| 3039 if (y_current->y_array != NULL) | |
| 3040 free_yank_all(); | |
| 3041 } | |
| 3042 } | |
| 3043 #endif | |
| 3044 | |
| 7 | 3045 /* |
| 3046 * Free "n" lines from the current yank register. | |
| 3047 * Called for normal freeing and in case of error. | |
| 3048 */ | |
| 3049 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3050 free_yank(long n) |
| 7 | 3051 { |
| 3052 if (y_current->y_array != NULL) | |
| 3053 { | |
| 3054 long i; | |
| 3055 | |
| 3056 for (i = n; --i >= 0; ) | |
| 3057 { | |
| 3058 #ifdef AMIGA /* only for very slow machines */ | |
| 3059 if ((i & 1023) == 1023) /* this may take a while */ | |
| 3060 { | |
| 3061 /* | |
| 3062 * This message should never cause a hit-return message. | |
| 3063 * Overwrite this message with any next message. | |
| 3064 */ | |
| 3065 ++no_wait_return; | |
| 3066 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
| 3067 --no_wait_return; | |
| 3068 msg_didout = FALSE; | |
| 3069 msg_col = 0; | |
| 3070 } | |
| 3071 #endif | |
| 3072 vim_free(y_current->y_array[i]); | |
| 3073 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
3074 VIM_CLEAR(y_current->y_array); |
| 7 | 3075 #ifdef AMIGA |
| 3076 if (n >= 1000) | |
| 3077 MSG(""); | |
| 3078 #endif | |
| 3079 } | |
| 3080 } | |
| 3081 | |
| 3082 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3083 free_yank_all(void) |
| 7 | 3084 { |
| 3085 free_yank(y_current->y_size); | |
| 3086 } | |
| 3087 | |
| 3088 /* | |
| 3089 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
| 3090 * If we are to append (uppercase register), we first yank into a new yank | |
| 3091 * register and then concatenate the old and the new one (so we keep the old | |
| 3092 * one in case of out-of-memory). | |
| 3093 * | |
|
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
3094 * Return FAIL for failure, OK otherwise. |
| 7 | 3095 */ |
| 3096 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3097 op_yank(oparg_T *oap, int deleting, int mess) |
| 7 | 3098 { |
| 3099 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
|
3100 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
|
3101 yankreg_T newreg; /* new yank register when appending */ |
| 7 | 3102 char_u **new_ptr; |
| 3103 linenr_T lnum; /* current line number */ | |
| 3104 long j; | |
| 3105 int yanktype = oap->motion_type; | |
| 3106 long yanklines = oap->line_count; | |
| 3107 linenr_T yankendlnum = oap->end.lnum; | |
| 3108 char_u *p; | |
| 3109 char_u *pnew; | |
| 3110 struct block_def bd; | |
| 2658 | 3111 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 2654 | 3112 int did_star = FALSE; |
| 2658 | 3113 #endif |
| 7 | 3114 |
| 3115 /* check for read-only register */ | |
| 3116 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
| 3117 { | |
| 3118 beep_flush(); | |
| 3119 return FAIL; | |
| 3120 } | |
| 3121 if (oap->regname == '_') /* black hole: nothing to do */ | |
| 3122 return OK; | |
| 3123 | |
| 3124 #ifdef FEAT_CLIPBOARD | |
| 3125 if (!clip_star.available && oap->regname == '*') | |
| 3126 oap->regname = 0; | |
| 3127 else if (!clip_plus.available && oap->regname == '+') | |
| 3128 oap->regname = 0; | |
| 3129 #endif | |
| 3130 | |
| 3131 if (!deleting) /* op_delete() already set y_current */ | |
| 3132 get_yank_register(oap->regname, TRUE); | |
| 3133 | |
| 3134 curr = y_current; | |
| 3135 /* append to existing contents */ | |
| 3136 if (y_append && y_current->y_array != NULL) | |
| 3137 y_current = &newreg; | |
| 3138 else | |
| 3139 free_yank_all(); /* free previously yanked lines */ | |
| 3140 | |
| 593 | 3141 /* |
| 3142 * If the cursor was in column 1 before and after the movement, and the | |
| 3143 * operator is not inclusive, the yank is always linewise. | |
| 3144 */ | |
| 7 | 3145 if ( oap->motion_type == MCHAR |
| 3146 && oap->start.col == 0 | |
| 3147 && !oap->inclusive | |
| 3148 && (!oap->is_VIsual || *p_sel == 'o') | |
| 50 | 3149 && !oap->block_mode |
| 7 | 3150 && oap->end.col == 0 |
| 3151 && yanklines > 1) | |
| 3152 { | |
| 3153 yanktype = MLINE; | |
| 3154 --yankendlnum; | |
| 3155 --yanklines; | |
| 3156 } | |
| 3157 | |
| 3158 y_current->y_size = yanklines; | |
| 3159 y_current->y_type = yanktype; /* set the yank register type */ | |
| 3160 y_current->y_width = 0; | |
| 3161 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
| 3162 yanklines), TRUE); | |
| 3163 if (y_current->y_array == NULL) | |
| 3164 { | |
| 3165 y_current = curr; | |
| 3166 return FAIL; | |
| 3167 } | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3168 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3169 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
|
3170 #endif |
| 7 | 3171 |
| 3172 y_idx = 0; | |
| 3173 lnum = oap->start.lnum; | |
| 3174 | |
| 3175 if (oap->block_mode) | |
| 3176 { | |
| 3177 /* Visual block mode */ | |
| 3178 y_current->y_type = MBLOCK; /* set the yank register type */ | |
| 3179 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
| 3180 | |
| 3181 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
| 3182 y_current->y_width--; | |
| 3183 } | |
| 3184 | |
| 3185 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
| 3186 { | |
| 3187 switch (y_current->y_type) | |
| 3188 { | |
| 3189 case MBLOCK: | |
| 3190 block_prep(oap, &bd, lnum, FALSE); | |
| 3191 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3192 goto fail; | |
| 3193 break; | |
| 3194 | |
| 3195 case MLINE: | |
| 3196 if ((y_current->y_array[y_idx] = | |
| 3197 vim_strsave(ml_get(lnum))) == NULL) | |
| 3198 goto fail; | |
| 3199 break; | |
| 3200 | |
| 3201 case MCHAR: | |
| 3202 { | |
| 3203 colnr_T startcol = 0, endcol = MAXCOL; | |
| 3204 #ifdef FEAT_VIRTUALEDIT | |
| 3205 int is_oneChar = FALSE; | |
| 3206 colnr_T cs, ce; | |
| 3207 #endif | |
| 3208 p = ml_get(lnum); | |
| 3209 bd.startspaces = 0; | |
| 3210 bd.endspaces = 0; | |
| 3211 | |
| 3212 if (lnum == oap->start.lnum) | |
| 3213 { | |
| 3214 startcol = oap->start.col; | |
| 3215 #ifdef FEAT_VIRTUALEDIT | |
| 3216 if (virtual_op) | |
| 3217 { | |
| 3218 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
| 3219 if (ce != cs && oap->start.coladd > 0) | |
| 3220 { | |
| 3221 /* Part of a tab selected -- but don't | |
| 3222 * double-count it. */ | |
| 3223 bd.startspaces = (ce - cs + 1) | |
| 3224 - oap->start.coladd; | |
| 3225 startcol++; | |
| 3226 } | |
| 3227 } | |
| 3228 #endif | |
| 3229 } | |
| 3230 | |
| 3231 if (lnum == oap->end.lnum) | |
| 3232 { | |
| 3233 endcol = oap->end.col; | |
| 3234 #ifdef FEAT_VIRTUALEDIT | |
| 3235 if (virtual_op) | |
| 3236 { | |
| 3237 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
| 3238 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
| 3239 # ifdef FEAT_MBYTE | |
| 3240 /* Don't add space for double-wide | |
| 3241 * char; endcol will be on last byte | |
| 3242 * of multi-byte char. */ | |
| 3243 && (*mb_head_off)(p, p + endcol) == 0 | |
| 3244 # endif | |
| 3245 )) | |
| 3246 { | |
| 3247 if (oap->start.lnum == oap->end.lnum | |
| 3248 && oap->start.col == oap->end.col) | |
| 3249 { | |
| 3250 /* Special case: inside a single char */ | |
| 3251 is_oneChar = TRUE; | |
| 3252 bd.startspaces = oap->end.coladd | |
| 3253 - oap->start.coladd + oap->inclusive; | |
| 3254 endcol = startcol; | |
| 3255 } | |
| 3256 else | |
| 3257 { | |
| 3258 bd.endspaces = oap->end.coladd | |
| 3259 + oap->inclusive; | |
| 3260 endcol -= oap->inclusive; | |
| 3261 } | |
| 3262 } | |
| 3263 } | |
| 3264 #endif | |
| 3265 } | |
| 3510 | 3266 if (endcol == MAXCOL) |
| 3267 endcol = (colnr_T)STRLEN(p); | |
| 7 | 3268 if (startcol > endcol |
| 3269 #ifdef FEAT_VIRTUALEDIT | |
| 3270 || is_oneChar | |
| 3271 #endif | |
| 3272 ) | |
| 3273 bd.textlen = 0; | |
| 3274 else | |
| 3275 { | |
| 3276 bd.textlen = endcol - startcol + oap->inclusive; | |
| 3277 } | |
| 3278 bd.textstart = p + startcol; | |
| 3279 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3280 goto fail; | |
| 3281 break; | |
| 3282 } | |
| 3283 /* NOTREACHED */ | |
| 3284 } | |
| 3285 } | |
| 3286 | |
| 3287 if (curr != y_current) /* append the new block to the old block */ | |
| 3288 { | |
| 3289 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
| 3290 (curr->y_size + y_current->y_size)), TRUE); | |
| 3291 if (new_ptr == NULL) | |
| 3292 goto fail; | |
| 3293 for (j = 0; j < curr->y_size; ++j) | |
| 3294 new_ptr[j] = curr->y_array[j]; | |
| 3295 vim_free(curr->y_array); | |
| 3296 curr->y_array = new_ptr; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3297 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3298 curr->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3299 #endif |
| 7 | 3300 |
| 3301 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
| 3302 curr->y_type = MLINE; | |
| 3303 | |
| 164 | 3304 /* Concatenate the last line of the old block with the first line of |
| 3305 * the new block, unless being Vi compatible. */ | |
| 3306 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
| 7 | 3307 { |
| 3308 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
| 3309 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
| 3310 if (pnew == NULL) | |
| 3311 { | |
| 3312 y_idx = y_current->y_size - 1; | |
| 3313 goto fail; | |
| 3314 } | |
| 3315 STRCPY(pnew, curr->y_array[--j]); | |
| 3316 STRCAT(pnew, y_current->y_array[0]); | |
| 3317 vim_free(curr->y_array[j]); | |
| 3318 vim_free(y_current->y_array[0]); | |
| 3319 curr->y_array[j++] = pnew; | |
| 3320 y_idx = 1; | |
| 3321 } | |
| 3322 else | |
| 3323 y_idx = 0; | |
| 3324 while (y_idx < y_current->y_size) | |
| 3325 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
| 3326 curr->y_size = j; | |
| 3327 vim_free(y_current->y_array); | |
| 3328 y_current = curr; | |
| 3329 } | |
| 5981 | 3330 if (curwin->w_p_rnu) |
| 3331 redraw_later(SOME_VALID); /* cursor moved to start */ | |
| 7 | 3332 if (mess) /* Display message about yank? */ |
| 3333 { | |
| 3334 if (yanktype == MCHAR | |
| 3335 && !oap->block_mode | |
| 3336 && yanklines == 1) | |
| 3337 yanklines = 0; | |
| 3338 /* Some versions of Vi use ">=" here, some don't... */ | |
| 3339 if (yanklines > p_report) | |
| 3340 { | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3341 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
|
3342 |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3343 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
|
3344 *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
|
3345 else |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3346 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
|
3347 _(" 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
|
3348 |
| 7 | 3349 /* redisplay now, so message is not deleted */ |
| 3350 update_topline_redraw(); | |
| 3351 if (yanklines == 1) | |
| 205 | 3352 { |
| 3353 if (oap->block_mode) | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3354 smsg((char_u *)_("block of 1 line yanked%s"), namebuf); |
| 205 | 3355 else |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3356 smsg((char_u *)_("1 line yanked%s"), namebuf); |
| 205 | 3357 } |
| 3358 else if (oap->block_mode) | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3359 smsg((char_u *)_("block of %ld lines yanked%s"), |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3360 yanklines, namebuf); |
| 7 | 3361 else |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3362 smsg((char_u *)_("%ld lines yanked%s"), yanklines, |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3363 namebuf); |
| 7 | 3364 } |
| 3365 } | |
| 3366 | |
| 3367 /* | |
| 3368 * Set "'[" and "']" marks. | |
| 3369 */ | |
| 3370 curbuf->b_op_start = oap->start; | |
| 3371 curbuf->b_op_end = oap->end; | |
| 5735 | 3372 if (yanktype == MLINE && !oap->block_mode) |
| 36 | 3373 { |
| 3374 curbuf->b_op_start.col = 0; | |
| 3375 curbuf->b_op_end.col = MAXCOL; | |
| 3376 } | |
| 7 | 3377 |
| 3378 #ifdef FEAT_CLIPBOARD | |
| 3379 /* | |
| 3380 * If we were yanking to the '*' register, send result to clipboard. | |
| 3381 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
| 3382 * to the '*' register. | |
| 3383 */ | |
| 3384 if (clip_star.available | |
| 3385 && (curr == &(y_regs[STAR_REGISTER]) | |
| 2654 | 3386 || (!deleting && oap->regname == 0 |
| 6116 | 3387 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
| 7 | 3388 { |
| 3389 if (curr != &(y_regs[STAR_REGISTER])) | |
| 3390 /* Copy the text from register 0 to the clipboard register. */ | |
| 3391 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3392 | |
| 3393 clip_own_selection(&clip_star); | |
| 3394 clip_gen_set_selection(&clip_star); | |
| 2658 | 3395 # ifdef FEAT_X11 |
| 2654 | 3396 did_star = TRUE; |
| 2658 | 3397 # endif |
| 7 | 3398 } |
| 3399 | |
| 3400 # ifdef FEAT_X11 | |
| 3401 /* | |
| 3402 * If we were yanking to the '+' register, send result to selection. | |
| 3403 * Also copy to the '*' register, in case auto-select is off. | |
| 3404 */ | |
| 2654 | 3405 if (clip_plus.available |
| 3406 && (curr == &(y_regs[PLUS_REGISTER]) | |
| 3407 || (!deleting && oap->regname == 0 | |
| 6116 | 3408 && ((clip_unnamed | clip_unnamed_saved) & |
| 3409 CLIP_UNNAMED_PLUS)))) | |
| 7 | 3410 { |
| 2654 | 3411 if (curr != &(y_regs[PLUS_REGISTER])) |
| 3412 /* Copy the text from register 0 to the clipboard register. */ | |
| 3413 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 3414 | |
| 7 | 3415 clip_own_selection(&clip_plus); |
| 3416 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
|
3417 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
|
3418 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
| 7 | 3419 { |
| 3420 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3421 clip_own_selection(&clip_star); | |
| 3422 clip_gen_set_selection(&clip_star); | |
| 3423 } | |
| 3424 } | |
| 3425 # endif | |
| 3426 #endif | |
| 3427 | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3428 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3429 if (!deleting && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3430 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
|
3431 #endif |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3432 |
| 7 | 3433 return OK; |
| 3434 | |
| 3435 fail: /* free the allocated lines */ | |
| 3436 free_yank(y_idx + 1); | |
| 3437 y_current = curr; | |
| 3438 return FAIL; | |
| 3439 } | |
| 3440 | |
| 3441 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3442 yank_copy_line(struct block_def *bd, long y_idx) |
| 7 | 3443 { |
| 3444 char_u *pnew; | |
| 3445 | |
| 3446 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
| 3447 == NULL) | |
| 3448 return FAIL; | |
| 3449 y_current->y_array[y_idx] = pnew; | |
| 6929 | 3450 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
| 7 | 3451 pnew += bd->startspaces; |
| 3452 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
| 3453 pnew += bd->textlen; | |
| 6929 | 3454 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
| 7 | 3455 pnew += bd->endspaces; |
| 3456 *pnew = NUL; | |
| 3457 return OK; | |
| 3458 } | |
| 3459 | |
| 3460 #ifdef FEAT_CLIPBOARD | |
| 3461 /* | |
| 3462 * Make a copy of the y_current register to register "reg". | |
| 3463 */ | |
| 3464 static void | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3465 copy_yank_reg(yankreg_T *reg) |
| 7 | 3466 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3467 yankreg_T *curr = y_current; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3468 long j; |
| 7 | 3469 |
| 3470 y_current = reg; | |
| 3471 free_yank_all(); | |
| 3472 *y_current = *curr; | |
| 3473 y_current->y_array = (char_u **)lalloc_clear( | |
| 3474 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
| 3475 if (y_current->y_array == NULL) | |
| 3476 y_current->y_size = 0; | |
| 3477 else | |
| 3478 for (j = 0; j < y_current->y_size; ++j) | |
| 3479 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
| 3480 { | |
| 3481 free_yank(j); | |
| 3482 y_current->y_size = 0; | |
| 3483 break; | |
| 3484 } | |
| 3485 y_current = curr; | |
| 3486 } | |
| 3487 #endif | |
| 3488 | |
| 3489 /* | |
| 140 | 3490 * Put contents of register "regname" into the text. |
| 3491 * Caller must check "regname" to be valid! | |
| 3492 * "flags": PUT_FIXINDENT make indent look nice | |
| 3493 * PUT_CURSEND leave cursor after end of new text | |
| 3494 * PUT_LINE force linewise put (":put") | |
| 7 | 3495 */ |
| 3496 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3497 do_put( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3498 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3499 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
|
3500 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3501 int flags) |
| 7 | 3502 { |
| 3503 char_u *ptr; | |
| 3504 char_u *newp, *oldp; | |
| 3505 int yanklen; | |
| 3506 int totlen = 0; /* init for gcc */ | |
| 3507 linenr_T lnum; | |
| 3508 colnr_T col; | |
| 3509 long i; /* index in y_array[] */ | |
| 3510 int y_type; | |
| 3511 long y_size; | |
| 3512 int oldlen; | |
| 3513 long y_width = 0; | |
| 3514 colnr_T vcol; | |
| 3515 int delcount; | |
| 3516 int incr = 0; | |
| 3517 long j; | |
| 3518 struct block_def bd; | |
| 3519 char_u **y_array = NULL; | |
| 3520 long nr_lines = 0; | |
| 3521 pos_T new_cursor; | |
| 3522 int indent; | |
| 3523 int orig_indent = 0; /* init for gcc */ | |
| 3524 int indent_diff = 0; /* init for gcc */ | |
| 3525 int first_indent = TRUE; | |
| 3526 int lendiff = 0; | |
| 3527 pos_T old_pos; | |
| 3528 char_u *insert_string = NULL; | |
| 3529 int allocated = FALSE; | |
| 3530 long cnt; | |
| 3531 | |
| 3532 #ifdef FEAT_CLIPBOARD | |
| 3533 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
| 3534 adjust_clip_reg(®name); | |
| 3535 (void)may_get_selection(regname); | |
| 3536 #endif | |
| 3537 | |
| 3538 if (flags & PUT_FIXINDENT) | |
| 3539 orig_indent = get_indent(); | |
| 3540 | |
| 3541 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3542 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3543 | |
| 3544 /* | |
| 3545 * Using inserted text works differently, because the register includes | |
| 3546 * special characters (newlines, etc.). | |
| 3547 */ | |
| 3548 if (regname == '.') | |
| 3549 { | |
|
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3550 if (VIsual_active) |
|
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3551 stuffcharReadbuff(VIsual_mode); |
| 7 | 3552 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
| 3553 (count == -1 ? 'O' : 'i')), count, FALSE); | |
| 3554 /* Putting the text is done later, so can't really move the cursor to | |
| 3555 * the next character. Use "l" to simulate it. */ | |
| 3556 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
| 3557 stuffcharReadbuff('l'); | |
| 3558 return; | |
| 3559 } | |
| 3560 | |
| 3561 /* | |
| 3562 * For special registers '%' (file name), '#' (alternate file name) and | |
| 3563 * ':' (last command line), etc. we have to create a fake yank register. | |
| 3564 */ | |
| 3565 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
| 3566 { | |
| 3567 if (insert_string == NULL) | |
| 3568 return; | |
| 3569 } | |
| 3570 | |
|
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3571 /* 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
|
3572 * 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
|
3573 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
|
3574 goto end; |
| 4005 | 3575 |
| 7 | 3576 if (insert_string != NULL) |
| 3577 { | |
| 3578 y_type = MCHAR; | |
| 3579 #ifdef FEAT_EVAL | |
| 3580 if (regname == '=') | |
| 3581 { | |
| 3582 /* For the = register we need to split the string at NL | |
| 3093 | 3583 * characters. |
| 3584 * Loop twice: count the number of lines and save them. */ | |
| 7 | 3585 for (;;) |
| 3586 { | |
| 3587 y_size = 0; | |
| 3588 ptr = insert_string; | |
| 3589 while (ptr != NULL) | |
| 3590 { | |
| 3591 if (y_array != NULL) | |
| 3592 y_array[y_size] = ptr; | |
| 3593 ++y_size; | |
| 3594 ptr = vim_strchr(ptr, '\n'); | |
| 3595 if (ptr != NULL) | |
| 3596 { | |
| 3597 if (y_array != NULL) | |
| 3598 *ptr = NUL; | |
| 3599 ++ptr; | |
| 3093 | 3600 /* A trailing '\n' makes the register linewise. */ |
| 7 | 3601 if (*ptr == NUL) |
| 3602 { | |
| 3603 y_type = MLINE; | |
| 3604 break; | |
| 3605 } | |
| 3606 } | |
| 3607 } | |
| 3608 if (y_array != NULL) | |
| 3609 break; | |
| 3610 y_array = (char_u **)alloc((unsigned) | |
| 3611 (y_size * sizeof(char_u *))); | |
| 3612 if (y_array == NULL) | |
| 3613 goto end; | |
| 3614 } | |
| 3615 } | |
| 3616 else | |
| 3617 #endif | |
| 3618 { | |
| 3619 y_size = 1; /* use fake one-line yank register */ | |
| 3620 y_array = &insert_string; | |
| 3621 } | |
| 3622 } | |
| 3623 else | |
| 3624 { | |
| 3625 get_yank_register(regname, FALSE); | |
| 3626 | |
| 3627 y_type = y_current->y_type; | |
| 3628 y_width = y_current->y_width; | |
| 3629 y_size = y_current->y_size; | |
| 3630 y_array = y_current->y_array; | |
| 3631 } | |
| 3632 | |
| 3633 if (y_type == MLINE) | |
| 3634 { | |
| 3635 if (flags & PUT_LINE_SPLIT) | |
| 3636 { | |
| 6845 | 3637 char_u *p; |
| 3638 | |
| 7 | 3639 /* "p" or "P" in Visual mode: split the lines to put the text in |
| 3640 * between. */ | |
| 3641 if (u_save_cursor() == FAIL) | |
| 3642 goto end; | |
| 6845 | 3643 p = ml_get_cursor(); |
| 3644 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
|
3645 MB_PTR_ADV(p); |
| 6845 | 3646 ptr = vim_strsave(p); |
| 7 | 3647 if (ptr == NULL) |
| 3648 goto end; | |
| 3649 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
| 3650 vim_free(ptr); | |
| 3651 | |
| 6845 | 3652 oldp = ml_get_curline(); |
| 3653 p = oldp + curwin->w_cursor.col; | |
| 3654 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
|
3655 MB_PTR_ADV(p); |
| 6845 | 3656 ptr = vim_strnsave(oldp, p - oldp); |
| 7 | 3657 if (ptr == NULL) |
| 3658 goto end; | |
| 3659 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
| 3660 ++nr_lines; | |
| 3661 dir = FORWARD; | |
| 3662 } | |
| 3663 if (flags & PUT_LINE_FORWARD) | |
| 3664 { | |
| 3665 /* Must be "p" for a Visual block, put lines below the block. */ | |
| 692 | 3666 curwin->w_cursor = curbuf->b_visual.vi_end; |
| 7 | 3667 dir = FORWARD; |
| 3668 } | |
| 3669 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3670 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3671 } | |
| 3672 | |
| 3673 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
| 3674 y_type = MLINE; | |
| 3675 | |
| 3676 if (y_size == 0 || y_array == NULL) | |
| 3677 { | |
| 3678 EMSG2(_("E353: Nothing in register %s"), | |
| 3679 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
| 3680 goto end; | |
| 3681 } | |
| 3682 | |
| 3683 if (y_type == MBLOCK) | |
| 3684 { | |
| 3685 lnum = curwin->w_cursor.lnum + y_size + 1; | |
| 3686 if (lnum > curbuf->b_ml.ml_line_count) | |
| 3687 lnum = curbuf->b_ml.ml_line_count + 1; | |
| 3688 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
| 3689 goto end; | |
| 3690 } | |
| 5735 | 3691 else if (y_type == MLINE) |
| 7 | 3692 { |
| 3693 lnum = curwin->w_cursor.lnum; | |
| 3694 #ifdef FEAT_FOLDING | |
| 3695 /* Correct line number for closed fold. Don't move the cursor yet, | |
| 3696 * u_save() uses it. */ | |
| 3697 if (dir == BACKWARD) | |
| 3698 (void)hasFolding(lnum, &lnum, NULL); | |
| 3699 else | |
| 3700 (void)hasFolding(lnum, NULL, &lnum); | |
| 3701 #endif | |
| 3702 if (dir == FORWARD) | |
| 3703 ++lnum; | |
|
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3704 /* 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
|
3705 * 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
|
3706 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
| 7 | 3707 goto end; |
| 3708 #ifdef FEAT_FOLDING | |
| 3709 if (dir == FORWARD) | |
| 3710 curwin->w_cursor.lnum = lnum - 1; | |
| 3711 else | |
| 3712 curwin->w_cursor.lnum = lnum; | |
| 3713 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
| 3714 #endif | |
| 3715 } | |
| 3716 else if (u_save_cursor() == FAIL) | |
| 3717 goto end; | |
| 3718 | |
| 3719 yanklen = (int)STRLEN(y_array[0]); | |
| 3720 | |
| 3721 #ifdef FEAT_VIRTUALEDIT | |
| 3722 if (ve_flags == VE_ALL && y_type == MCHAR) | |
| 3723 { | |
| 3724 if (gchar_cursor() == TAB) | |
| 3725 { | |
| 3726 /* Don't need to insert spaces when "p" on the last position of a | |
| 3727 * 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
|
3728 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3729 int viscol = getviscol(); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3730 if (dir == FORWARD |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3731 ? 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
|
3732 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
|
3733 : 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
|
3734 coladvance_force(viscol); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3735 #else |
| 7 | 3736 if (dir == FORWARD |
| 3737 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
| 3738 : curwin->w_cursor.coladd > 0) | |
| 3739 coladvance_force(getviscol()); | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3740 #endif |
| 7 | 3741 else |
| 3742 curwin->w_cursor.coladd = 0; | |
| 3743 } | |
| 3744 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
| 3745 coladvance_force(getviscol() + (dir == FORWARD)); | |
| 3746 } | |
| 3747 #endif | |
| 3748 | |
| 3749 lnum = curwin->w_cursor.lnum; | |
| 3750 col = curwin->w_cursor.col; | |
| 3751 | |
| 3752 /* | |
| 3753 * Block mode | |
| 3754 */ | |
| 3755 if (y_type == MBLOCK) | |
| 3756 { | |
|
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3757 int c = gchar_cursor(); |
| 7 | 3758 colnr_T endcol2 = 0; |
| 3759 | |
| 3760 if (dir == FORWARD && c != NUL) | |
| 3761 { | |
| 3762 #ifdef FEAT_VIRTUALEDIT | |
| 3763 if (ve_flags == VE_ALL) | |
| 3764 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3765 else | |
| 3766 #endif | |
| 3767 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
| 3768 | |
| 3769 #ifdef FEAT_MBYTE | |
| 3770 if (has_mbyte) | |
| 3771 /* move to start of next multi-byte character */ | |
| 474 | 3772 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3773 else |
| 3774 #endif | |
| 3775 #ifdef FEAT_VIRTUALEDIT | |
| 3776 if (c != TAB || ve_flags != VE_ALL) | |
| 3777 #endif | |
| 3778 ++curwin->w_cursor.col; | |
| 3779 ++col; | |
| 3780 } | |
| 3781 else | |
| 3782 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3783 | |
| 3784 #ifdef FEAT_VIRTUALEDIT | |
| 3785 col += curwin->w_cursor.coladd; | |
| 1304 | 3786 if (ve_flags == VE_ALL |
| 3787 && (curwin->w_cursor.coladd > 0 | |
| 3788 || endcol2 == curwin->w_cursor.col)) | |
| 7 | 3789 { |
| 3790 if (dir == FORWARD && c == NUL) | |
| 3791 ++col; | |
| 3792 if (dir != FORWARD && c != NUL) | |
| 3793 ++curwin->w_cursor.col; | |
| 3794 if (c == TAB) | |
| 3795 { | |
| 3796 if (dir == BACKWARD && curwin->w_cursor.col) | |
| 3797 curwin->w_cursor.col--; | |
| 3798 if (dir == FORWARD && col - 1 == endcol2) | |
| 3799 curwin->w_cursor.col++; | |
| 3800 } | |
| 3801 } | |
| 3802 curwin->w_cursor.coladd = 0; | |
| 3803 #endif | |
| 699 | 3804 bd.textcol = 0; |
| 7 | 3805 for (i = 0; i < y_size; ++i) |
| 3806 { | |
| 3807 int spaces; | |
| 3808 char shortline; | |
| 3809 | |
| 3810 bd.startspaces = 0; | |
| 3811 bd.endspaces = 0; | |
| 3812 vcol = 0; | |
| 3813 delcount = 0; | |
| 3814 | |
| 3815 /* add a new line */ | |
| 3816 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
| 3817 { | |
| 3818 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
| 3819 (colnr_T)1, FALSE) == FAIL) | |
| 3820 break; | |
| 3821 ++nr_lines; | |
| 3822 } | |
| 3823 /* get the old line and advance to the position to insert at */ | |
| 3824 oldp = ml_get_curline(); | |
| 3825 oldlen = (int)STRLEN(oldp); | |
| 3826 for (ptr = oldp; vcol < col && *ptr; ) | |
| 3827 { | |
| 3828 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 3829 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
| 7 | 3830 vcol += incr; |
| 3831 } | |
| 3832 bd.textcol = (colnr_T)(ptr - oldp); | |
| 3833 | |
| 3834 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
| 3835 | |
| 3836 if (vcol < col) /* line too short, padd with spaces */ | |
| 3837 bd.startspaces = col - vcol; | |
| 3838 else if (vcol > col) | |
| 3839 { | |
| 3840 bd.endspaces = vcol - col; | |
| 3841 bd.startspaces = incr - bd.endspaces; | |
| 3842 --bd.textcol; | |
| 3843 delcount = 1; | |
| 3844 #ifdef FEAT_MBYTE | |
| 3845 if (has_mbyte) | |
| 3846 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
| 3847 #endif | |
| 3848 if (oldp[bd.textcol] != TAB) | |
| 3849 { | |
| 3850 /* Only a Tab can be split into spaces. Other | |
| 3851 * characters will have to be moved to after the | |
| 3852 * block, causing misalignment. */ | |
| 3853 delcount = 0; | |
| 3854 bd.endspaces = 0; | |
| 3855 } | |
| 3856 } | |
| 3857 | |
| 3858 yanklen = (int)STRLEN(y_array[i]); | |
| 3859 | |
| 3860 /* calculate number of spaces required to fill right side of block*/ | |
| 3861 spaces = y_width + 1; | |
| 3862 for (j = 0; j < yanklen; j++) | |
| 5995 | 3863 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
| 7 | 3864 if (spaces < 0) |
| 3865 spaces = 0; | |
| 3866 | |
| 3867 /* insert the new text */ | |
| 3868 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
| 3869 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
| 3870 if (newp == NULL) | |
| 3871 break; | |
| 3872 /* copy part up to cursor to new line */ | |
| 3873 ptr = newp; | |
| 3874 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
| 3875 ptr += bd.textcol; | |
| 3876 /* may insert some spaces before the new text */ | |
| 6929 | 3877 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
| 7 | 3878 ptr += bd.startspaces; |
| 3879 /* insert the new text */ | |
| 3880 for (j = 0; j < count; ++j) | |
| 3881 { | |
| 3882 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
| 3883 ptr += yanklen; | |
| 3884 | |
| 3885 /* insert block's trailing spaces only if there's text behind */ | |
| 3886 if ((j < count - 1 || !shortline) && spaces) | |
| 3887 { | |
| 6929 | 3888 vim_memset(ptr, ' ', (size_t)spaces); |
| 7 | 3889 ptr += spaces; |
| 3890 } | |
| 3891 } | |
| 3892 /* may insert some spaces after the new text */ | |
| 6929 | 3893 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
| 7 | 3894 ptr += bd.endspaces; |
| 3895 /* move the text after the cursor to the end of the line. */ | |
| 3896 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
| 3897 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
| 3898 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 3899 | |
| 3900 ++curwin->w_cursor.lnum; | |
| 3901 if (i == 0) | |
| 3902 curwin->w_cursor.col += bd.startspaces; | |
| 3903 } | |
| 3904 | |
| 3905 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
| 3906 | |
| 3907 /* Set '[ mark. */ | |
| 3908 curbuf->b_op_start = curwin->w_cursor; | |
| 3909 curbuf->b_op_start.lnum = lnum; | |
| 3910 | |
| 3911 /* adjust '] mark */ | |
| 3912 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
| 3913 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
| 237 | 3914 # ifdef FEAT_VIRTUALEDIT |
| 7 | 3915 curbuf->b_op_end.coladd = 0; |
| 237 | 3916 # endif |
| 7 | 3917 if (flags & PUT_CURSEND) |
| 3918 { | |
| 916 | 3919 colnr_T len; |
| 3920 | |
| 7 | 3921 curwin->w_cursor = curbuf->b_op_end; |
| 3922 curwin->w_cursor.col++; | |
| 916 | 3923 |
| 3924 /* in Insert mode we might be after the NUL, correct for that */ | |
| 3925 len = (colnr_T)STRLEN(ml_get_curline()); | |
| 3926 if (curwin->w_cursor.col > len) | |
| 3927 curwin->w_cursor.col = len; | |
| 7 | 3928 } |
| 3929 else | |
| 3930 curwin->w_cursor.lnum = lnum; | |
| 3931 } | |
| 3932 else | |
| 3933 { | |
| 3934 /* | |
| 3935 * Character or Line mode | |
| 3936 */ | |
| 3937 if (y_type == MCHAR) | |
| 3938 { | |
| 3939 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
| 3940 * char */ | |
| 3941 if (dir == FORWARD && gchar_cursor() != NUL) | |
| 3942 { | |
| 3943 #ifdef FEAT_MBYTE | |
| 3944 if (has_mbyte) | |
| 3945 { | |
| 474 | 3946 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3947 |
| 3948 /* put it on the next of the multi-byte character. */ | |
| 3949 col += bytelen; | |
| 3950 if (yanklen) | |
| 3951 { | |
| 3952 curwin->w_cursor.col += bytelen; | |
| 3953 curbuf->b_op_end.col += bytelen; | |
| 3954 } | |
| 3955 } | |
| 3956 else | |
| 3957 #endif | |
| 3958 { | |
| 3959 ++col; | |
| 3960 if (yanklen) | |
| 3961 { | |
| 3962 ++curwin->w_cursor.col; | |
| 3963 ++curbuf->b_op_end.col; | |
| 3964 } | |
| 3965 } | |
| 3966 } | |
| 3967 curbuf->b_op_start = curwin->w_cursor; | |
| 3968 } | |
| 3969 /* | |
| 3970 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
| 3971 */ | |
| 3972 else if (dir == BACKWARD) | |
| 3973 --lnum; | |
| 699 | 3974 new_cursor = curwin->w_cursor; |
| 7 | 3975 |
| 3976 /* | |
| 3977 * simple case: insert into current line | |
| 3978 */ | |
| 3979 if (y_type == MCHAR && y_size == 1) | |
| 3980 { | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3981 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
|
3982 |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3983 if (VIsual_active) |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3984 { |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3985 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
|
3986 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
|
3987 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
|
3988 } |
|
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3989 |
| 5365 | 3990 do { |
| 3991 totlen = count * yanklen; | |
| 3992 if (totlen > 0) | |
| 7 | 3993 { |
| 5365 | 3994 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
|
3995 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
|
3996 { |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3997 lnum++; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3998 continue; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3999 } |
| 5365 | 4000 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
| 4001 if (newp == NULL) | |
| 4002 goto end; /* alloc() gave an error message */ | |
| 4003 mch_memmove(newp, oldp, (size_t)col); | |
| 4004 ptr = newp + col; | |
| 4005 for (i = 0; i < count; ++i) | |
| 4006 { | |
| 4007 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
| 4008 ptr += yanklen; | |
| 4009 } | |
| 4010 STRMOVE(ptr, oldp + col); | |
| 4011 ml_replace(lnum, newp, FALSE); | |
| 4012 /* Place cursor on last putted char. */ | |
| 4013 if (lnum == curwin->w_cursor.lnum) | |
| 5496 | 4014 { |
| 4015 /* make sure curwin->w_virtcol is updated */ | |
| 4016 changed_cline_bef_curs(); | |
| 5365 | 4017 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
| 5496 | 4018 } |
| 7 | 4019 } |
| 5365 | 4020 if (VIsual_active) |
| 4021 lnum++; | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
4022 } while (VIsual_active && lnum <= end_lnum); |
| 5365 | 4023 |
| 6379 | 4024 if (VIsual_active) /* reset lnum to the last visual line */ |
| 4025 lnum--; | |
| 4026 | |
| 7 | 4027 curbuf->b_op_end = curwin->w_cursor; |
| 4028 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
| 4029 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
| 4030 ++curwin->w_cursor.col; | |
| 4031 changed_bytes(lnum, col); | |
| 4032 } | |
| 4033 else | |
| 4034 { | |
| 4035 /* | |
| 4036 * Insert at least one line. When y_type is MCHAR, break the first | |
| 4037 * line in two. | |
| 4038 */ | |
| 4039 for (cnt = 1; cnt <= count; ++cnt) | |
| 4040 { | |
| 4041 i = 0; | |
| 4042 if (y_type == MCHAR) | |
| 4043 { | |
| 4044 /* | |
| 4045 * Split the current line in two at the insert position. | |
| 4046 * First insert y_array[size - 1] in front of second line. | |
| 4047 * Then append y_array[0] to first line. | |
| 4048 */ | |
| 4049 lnum = new_cursor.lnum; | |
| 4050 ptr = ml_get(lnum) + col; | |
| 4051 totlen = (int)STRLEN(y_array[y_size - 1]); | |
| 4052 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
| 4053 if (newp == NULL) | |
| 4054 goto error; | |
| 4055 STRCPY(newp, y_array[y_size - 1]); | |
| 4056 STRCAT(newp, ptr); | |
| 4057 /* insert second line */ | |
| 4058 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
| 4059 vim_free(newp); | |
| 4060 | |
| 4061 oldp = ml_get(lnum); | |
| 4062 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
| 4063 if (newp == NULL) | |
| 4064 goto error; | |
| 4065 /* copy first part of line */ | |
| 4066 mch_memmove(newp, oldp, (size_t)col); | |
| 4067 /* append to first line */ | |
| 4068 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
| 4069 ml_replace(lnum, newp, FALSE); | |
| 4070 | |
| 4071 curwin->w_cursor.lnum = lnum; | |
| 4072 i = 1; | |
| 4073 } | |
| 4074 | |
| 4075 for (; i < y_size; ++i) | |
| 4076 { | |
| 4077 if ((y_type != MCHAR || i < y_size - 1) | |
| 4078 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
| 4079 == FAIL) | |
| 4080 goto error; | |
| 4081 lnum++; | |
| 4082 ++nr_lines; | |
| 4083 if (flags & PUT_FIXINDENT) | |
| 4084 { | |
| 4085 old_pos = curwin->w_cursor; | |
| 4086 curwin->w_cursor.lnum = lnum; | |
| 4087 ptr = ml_get(lnum); | |
| 4088 if (cnt == count && i == y_size - 1) | |
| 4089 lendiff = (int)STRLEN(ptr); | |
| 4090 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 4091 if (*ptr == '#' && preprocs_left()) | |
| 4092 indent = 0; /* Leave # lines at start */ | |
| 4093 else | |
| 4094 #endif | |
| 4095 if (*ptr == NUL) | |
| 4096 indent = 0; /* Ignore empty lines */ | |
| 4097 else if (first_indent) | |
| 4098 { | |
| 4099 indent_diff = orig_indent - get_indent(); | |
| 4100 indent = orig_indent; | |
| 4101 first_indent = FALSE; | |
| 4102 } | |
| 4103 else if ((indent = get_indent() + indent_diff) < 0) | |
| 4104 indent = 0; | |
| 4105 (void)set_indent(indent, 0); | |
| 4106 curwin->w_cursor = old_pos; | |
| 4107 /* remember how many chars were removed */ | |
| 4108 if (cnt == count && i == y_size - 1) | |
| 4109 lendiff -= (int)STRLEN(ml_get(lnum)); | |
| 4110 } | |
| 4111 } | |
| 4112 } | |
| 4113 | |
| 4114 error: | |
| 4115 /* Adjust marks. */ | |
| 4116 if (y_type == MLINE) | |
| 4117 { | |
| 4118 curbuf->b_op_start.col = 0; | |
| 4119 if (dir == FORWARD) | |
| 4120 curbuf->b_op_start.lnum++; | |
| 4121 } | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4122 /* 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
|
4123 * 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
|
4124 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
|
4125 < 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
|
4126 #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
|
4127 || 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
|
4128 #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
|
4129 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4130 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
| 7 | 4131 (linenr_T)MAXLNUM, nr_lines, 0L); |
| 4132 | |
| 4133 /* note changed text for displaying and folding */ | |
| 4134 if (y_type == MCHAR) | |
| 4135 changed_lines(curwin->w_cursor.lnum, col, | |
| 4136 curwin->w_cursor.lnum + 1, nr_lines); | |
| 4137 else | |
| 4138 changed_lines(curbuf->b_op_start.lnum, 0, | |
| 4139 curbuf->b_op_start.lnum, nr_lines); | |
| 4140 | |
| 4141 /* put '] mark at last inserted character */ | |
| 4142 curbuf->b_op_end.lnum = lnum; | |
| 4143 /* correct length for change in indent */ | |
| 4144 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
| 4145 if (col > 1) | |
| 4146 curbuf->b_op_end.col = col - 1; | |
| 4147 else | |
| 4148 curbuf->b_op_end.col = 0; | |
| 4149 | |
| 168 | 4150 if (flags & PUT_CURSLINE) |
| 4151 { | |
| 237 | 4152 /* ":put": put cursor on last inserted line */ |
| 168 | 4153 curwin->w_cursor.lnum = lnum; |
| 4154 beginline(BL_WHITE | BL_FIX); | |
| 4155 } | |
| 4156 else if (flags & PUT_CURSEND) | |
| 7 | 4157 { |
| 4158 /* put cursor after inserted text */ | |
| 4159 if (y_type == MLINE) | |
| 4160 { | |
| 4161 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 4162 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 4163 else | |
| 4164 curwin->w_cursor.lnum = lnum + 1; | |
| 4165 curwin->w_cursor.col = 0; | |
| 4166 } | |
| 4167 else | |
| 4168 { | |
| 4169 curwin->w_cursor.lnum = lnum; | |
| 4170 curwin->w_cursor.col = col; | |
| 4171 } | |
| 4172 } | |
| 4173 else if (y_type == MLINE) | |
| 4174 { | |
| 168 | 4175 /* put cursor on first non-blank in first inserted line */ |
| 7 | 4176 curwin->w_cursor.col = 0; |
| 4177 if (dir == FORWARD) | |
| 4178 ++curwin->w_cursor.lnum; | |
| 4179 beginline(BL_WHITE | BL_FIX); | |
| 4180 } | |
| 4181 else /* put cursor on first inserted character */ | |
| 4182 curwin->w_cursor = new_cursor; | |
| 4183 } | |
| 4184 } | |
| 4185 | |
| 4186 msgmore(nr_lines); | |
| 4187 curwin->w_set_curswant = TRUE; | |
| 4188 | |
| 4189 end: | |
| 4190 if (allocated) | |
| 4191 vim_free(insert_string); | |
| 840 | 4192 if (regname == '=') |
| 4193 vim_free(y_array); | |
| 4194 | |
| 5380 | 4195 VIsual_active = FALSE; |
| 4196 | |
| 140 | 4197 /* If the cursor is past the end of the line put it at the end. */ |
| 844 | 4198 adjust_cursor_eol(); |
| 4199 } | |
| 4200 | |
| 4201 /* | |
| 4202 * When the cursor is on the NUL past the end of the line and it should not be | |
| 4203 * there move it left. | |
| 4204 */ | |
| 4205 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4206 adjust_cursor_eol(void) |
| 844 | 4207 { |
| 4208 if (curwin->w_cursor.col > 0 | |
| 4209 && gchar_cursor() == NUL | |
| 773 | 4210 #ifdef FEAT_VIRTUALEDIT |
| 4211 && (ve_flags & VE_ONEMORE) == 0 | |
| 4212 #endif | |
| 7 | 4213 && !(restart_edit || (State & INSERT))) |
| 4214 { | |
| 557 | 4215 /* Put the cursor on the last character in the line. */ |
| 555 | 4216 dec_cursor(); |
| 844 | 4217 |
| 7 | 4218 #ifdef FEAT_VIRTUALEDIT |
| 4219 if (ve_flags == VE_ALL) | |
| 557 | 4220 { |
| 4221 colnr_T scol, ecol; | |
| 4222 | |
| 4223 /* Coladd is set to the width of the last character. */ | |
| 4224 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
| 4225 curwin->w_cursor.coladd = ecol - scol + 1; | |
| 4226 } | |
| 7 | 4227 #endif |
| 4228 } | |
| 4229 } | |
| 4230 | |
| 4231 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 4232 /* | |
| 4233 * Return TRUE if lines starting with '#' should be left aligned. | |
| 4234 */ | |
| 4235 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4236 preprocs_left(void) |
| 7 | 4237 { |
| 4238 return | |
| 4239 # ifdef FEAT_SMARTINDENT | |
| 4240 # ifdef FEAT_CINDENT | |
| 4241 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
| 4242 # else | |
| 4243 curbuf->b_p_si | |
| 4244 # endif | |
| 4245 # endif | |
| 4246 # ifdef FEAT_CINDENT | |
| 5438 | 4247 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
| 4248 && curbuf->b_ind_hash_comment == 0) | |
| 7 | 4249 # endif |
| 4250 ; | |
| 4251 } | |
| 4252 #endif | |
| 4253 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4254 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4255 * 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
|
4256 */ |
| 7 | 4257 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4258 get_register_name(int num) |
| 7 | 4259 { |
| 4260 if (num == -1) | |
| 4261 return '"'; | |
| 4262 else if (num < 10) | |
| 4263 return num + '0'; | |
| 4264 else if (num == DELETION_REGISTER) | |
| 4265 return '-'; | |
| 4266 #ifdef FEAT_CLIPBOARD | |
| 4267 else if (num == STAR_REGISTER) | |
| 4268 return '*'; | |
| 4269 else if (num == PLUS_REGISTER) | |
| 4270 return '+'; | |
| 4271 #endif | |
| 4272 else | |
| 4273 { | |
| 4274 #ifdef EBCDIC | |
| 4275 int i; | |
| 4276 | |
| 4277 /* EBCDIC is really braindead ... */ | |
| 4278 i = 'a' + (num - 10); | |
| 4279 if (i > 'i') | |
| 4280 i += 7; | |
| 4281 if (i > 'r') | |
| 4282 i += 8; | |
| 4283 return i; | |
| 4284 #else | |
| 4285 return num + 'a' - 10; | |
| 4286 #endif | |
| 4287 } | |
| 4288 } | |
| 4289 | |
| 4290 /* | |
| 4291 * ":dis" and ":registers": Display the contents of the yank registers. | |
| 4292 */ | |
| 4293 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4294 ex_display(exarg_T *eap) |
| 7 | 4295 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4296 int i, n; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4297 long j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4298 char_u *p; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4299 yankreg_T *yb; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4300 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4301 int attr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4302 char_u *arg = eap->arg; |
| 22 | 4303 #ifdef FEAT_MBYTE |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4304 int clen; |
| 22 | 4305 #else |
| 4306 # define clen 1 | |
| 4307 #endif | |
| 7 | 4308 |
| 4309 if (arg != NULL && *arg == NUL) | |
| 4310 arg = NULL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4311 attr = HL_ATTR(HLF_8); |
| 7 | 4312 |
| 4313 /* Highlight title */ | |
| 4314 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
| 4315 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
| 4316 { | |
| 4317 name = get_register_name(i); | |
| 2644 | 4318 if (arg != NULL && vim_strchr(arg, name) == NULL |
| 4319 #ifdef ONE_CLIPBOARD | |
| 4320 /* Star register and plus register contain the same thing. */ | |
| 4321 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
| 4322 #endif | |
| 4323 ) | |
| 7 | 4324 continue; /* did not ask for this register */ |
| 4325 | |
| 4326 #ifdef FEAT_CLIPBOARD | |
| 4327 /* Adjust register name for "unnamed" in 'clipboard'. | |
| 4328 * When it's a clipboard register, fill it with the current contents | |
| 4329 * of the clipboard. */ | |
| 4330 adjust_clip_reg(&name); | |
| 4331 (void)may_get_selection(name); | |
| 4332 #endif | |
| 4333 | |
| 4334 if (i == -1) | |
| 4335 { | |
| 4336 if (y_previous != NULL) | |
| 4337 yb = y_previous; | |
| 4338 else | |
| 4339 yb = &(y_regs[0]); | |
| 4340 } | |
| 4341 else | |
| 4342 yb = &(y_regs[i]); | |
| 2000 | 4343 |
| 4344 #ifdef FEAT_EVAL | |
| 4345 if (name == MB_TOLOWER(redir_reg) | |
| 4346 || (redir_reg == '"' && yb == y_previous)) | |
| 4347 continue; /* do not list register being written to, the | |
| 4348 * pointer can be freed */ | |
| 4349 #endif | |
| 4350 | |
| 7 | 4351 if (yb->y_array != NULL) |
| 4352 { | |
| 4353 msg_putchar('\n'); | |
| 4354 msg_putchar('"'); | |
| 4355 msg_putchar(name); | |
| 4356 MSG_PUTS(" "); | |
| 4357 | |
| 4358 n = (int)Columns - 6; | |
| 4359 for (j = 0; j < yb->y_size && n > 1; ++j) | |
| 4360 { | |
| 4361 if (j) | |
| 4362 { | |
| 4363 MSG_PUTS_ATTR("^J", attr); | |
| 4364 n -= 2; | |
| 4365 } | |
| 4366 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
| 4367 { | |
| 4368 #ifdef FEAT_MBYTE | |
| 474 | 4369 clen = (*mb_ptr2len)(p); |
| 22 | 4370 #endif |
| 4371 msg_outtrans_len(p, clen); | |
| 4372 #ifdef FEAT_MBYTE | |
| 4373 p += clen - 1; | |
| 7 | 4374 #endif |
| 4375 } | |
| 4376 } | |
| 4377 if (n > 1 && yb->y_type == MLINE) | |
| 4378 MSG_PUTS_ATTR("^J", attr); | |
| 4379 out_flush(); /* show one line at a time */ | |
| 4380 } | |
| 4381 ui_breakcheck(); | |
| 4382 } | |
| 4383 | |
| 4384 /* | |
| 4385 * display last inserted text | |
| 4386 */ | |
| 4387 if ((p = get_last_insert()) != NULL | |
| 4388 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
| 4389 { | |
| 4390 MSG_PUTS("\n\". "); | |
| 4391 dis_msg(p, TRUE); | |
| 4392 } | |
| 4393 | |
| 4394 /* | |
| 4395 * display last command line | |
| 4396 */ | |
| 4397 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
| 4398 && !got_int) | |
| 4399 { | |
| 4400 MSG_PUTS("\n\": "); | |
| 4401 dis_msg(last_cmdline, FALSE); | |
| 4402 } | |
| 4403 | |
| 4404 /* | |
| 4405 * display current file name | |
| 4406 */ | |
| 4407 if (curbuf->b_fname != NULL | |
| 4408 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4409 { | |
| 4410 MSG_PUTS("\n\"% "); | |
| 4411 dis_msg(curbuf->b_fname, FALSE); | |
| 4412 } | |
| 4413 | |
| 4414 /* | |
| 4415 * display alternate file name | |
| 4416 */ | |
| 4417 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4418 { | |
| 4419 char_u *fname; | |
| 4420 linenr_T dummy; | |
| 4421 | |
| 4422 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
| 4423 { | |
| 4424 MSG_PUTS("\n\"# "); | |
| 4425 dis_msg(fname, FALSE); | |
| 4426 } | |
| 4427 } | |
| 4428 | |
| 4429 /* | |
| 4430 * display last search pattern | |
| 4431 */ | |
| 4432 if (last_search_pat() != NULL | |
| 4433 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
| 4434 { | |
| 4435 MSG_PUTS("\n\"/ "); | |
| 4436 dis_msg(last_search_pat(), FALSE); | |
| 4437 } | |
| 4438 | |
| 4439 #ifdef FEAT_EVAL | |
| 4440 /* | |
| 4441 * display last used expression | |
| 4442 */ | |
| 4443 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
| 4444 && !got_int) | |
| 4445 { | |
| 4446 MSG_PUTS("\n\"= "); | |
| 4447 dis_msg(expr_line, FALSE); | |
| 4448 } | |
| 4449 #endif | |
| 4450 } | |
| 4451 | |
| 4452 /* | |
| 4453 * display a string for do_dis() | |
| 4454 * truncate at end of screen line | |
| 4455 */ | |
| 4456 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4457 dis_msg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4458 char_u *p, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4459 int skip_esc) /* if TRUE, ignore trailing ESC */ |
| 7 | 4460 { |
| 4461 int n; | |
| 4462 #ifdef FEAT_MBYTE | |
| 4463 int l; | |
| 4464 #endif | |
| 4465 | |
| 4466 n = (int)Columns - 6; | |
| 4467 while (*p != NUL | |
| 4468 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
| 4469 && (n -= ptr2cells(p)) >= 0) | |
| 4470 { | |
| 4471 #ifdef FEAT_MBYTE | |
| 474 | 4472 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 4473 { |
| 4474 msg_outtrans_len(p, l); | |
| 4475 p += l; | |
| 4476 } | |
| 4477 else | |
| 4478 #endif | |
| 4479 msg_outtrans_len(p++, 1); | |
| 4480 } | |
| 4481 ui_breakcheck(); | |
| 4482 } | |
| 4483 | |
| 3562 | 4484 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4485 /* | |
| 4486 * If "process" is TRUE and the line begins with a comment leader (possibly | |
| 4487 * after some white space), return a pointer to the text after it. Put a boolean | |
| 4488 * value indicating whether the line ends with an unclosed comment in | |
| 4489 * "is_comment". | |
| 4490 * line - line to be processed, | |
| 4491 * process - if FALSE, will only check whether the line ends with an unclosed | |
| 3584 | 4492 * comment, |
| 3562 | 4493 * include_space - whether to also skip space following the comment leader, |
| 4494 * is_comment - will indicate whether the current line ends with an unclosed | |
| 3584 | 4495 * comment. |
| 3562 | 4496 */ |
|
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4497 char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4498 skip_comment( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4499 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4500 int process, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4501 int include_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4502 int *is_comment) |
| 3562 | 4503 { |
| 4504 char_u *comment_flags = NULL; | |
| 4505 int lead_len; | |
| 4506 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
| 4507 | |
| 4508 *is_comment = FALSE; | |
| 4509 if (leader_offset != -1) | |
| 4510 { | |
| 4511 /* Let's check whether the line ends with an unclosed comment. | |
| 4512 * If the last comment leader has COM_END in flags, there's no comment. | |
| 4513 */ | |
| 4514 while (*comment_flags) | |
| 4515 { | |
| 4516 if (*comment_flags == COM_END | |
| 4517 || *comment_flags == ':') | |
| 4518 break; | |
| 4519 ++comment_flags; | |
| 4520 } | |
| 4521 if (*comment_flags != COM_END) | |
| 4522 *is_comment = TRUE; | |
| 4523 } | |
| 4524 | |
| 4525 if (process == FALSE) | |
| 4526 return line; | |
| 4527 | |
| 4528 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
| 4529 | |
| 4530 if (lead_len == 0) | |
| 4531 return line; | |
| 4532 | |
| 4533 /* Find: | |
| 4534 * - COM_END, | |
| 4535 * - colon, | |
| 4536 * whichever comes first. | |
| 4537 */ | |
| 4538 while (*comment_flags) | |
| 4539 { | |
| 3580 | 4540 if (*comment_flags == COM_END |
| 3562 | 4541 || *comment_flags == ':') |
| 4542 { | |
| 4543 break; | |
| 4544 } | |
| 4545 ++comment_flags; | |
| 4546 } | |
| 4547 | |
| 4548 /* If we found a colon, it means that we are not processing a line | |
| 3580 | 4549 * starting with a closing part of a three-part comment. That's good, |
| 4550 * because we don't want to remove those as this would be annoying. | |
| 3562 | 4551 */ |
| 4552 if (*comment_flags == ':' || *comment_flags == NUL) | |
| 4553 line += lead_len; | |
| 4554 | |
| 4555 return line; | |
| 4556 } | |
| 4557 #endif | |
| 4558 | |
| 7 | 4559 /* |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4560 * 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
|
4561 * When "save_undo" is TRUE save lines for undo first. |
| 5848 | 4562 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
| 4563 * leaders should not be removed. | |
| 4564 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
| 4565 * to set those marks. | |
| 7 | 4566 * |
| 1217 | 4567 * return FAIL for failure, OK otherwise |
| 7 | 4568 */ |
| 4569 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4570 do_join( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4571 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4572 int insert_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4573 int save_undo, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4574 int use_formatoptions UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4575 int setmark) |
| 7 | 4576 { |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4577 char_u *curr = NULL; |
| 2597 | 4578 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
|
4579 char_u *cend; |
| 7 | 4580 char_u *newp; |
| 2597 | 4581 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
|
4582 int endcurr1 = NUL; |
|
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4583 int endcurr2 = NUL; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 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
|
4585 int sumsize = 0; /* size of the long new line */ |
| 7 | 4586 linenr_T t; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4587 colnr_T col = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4588 int ret = OK; |
| 3562 | 4589 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 3574 | 4590 int *comments = NULL; |
| 3562 | 4591 int remove_comments = (use_formatoptions == TRUE) |
| 4592 && has_format_option(FO_REMOVE_COMS); | |
| 4593 int prev_was_comment; | |
| 4594 #endif | |
| 4595 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4596 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 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
|
4598 (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
|
4599 return FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4600 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4601 /* 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
|
4602 * 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
|
4603 * proper placement of each original line in the new one. */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 spaces = lalloc_clear((long_u)count, TRUE); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4605 if (spaces == NULL) |
| 7 | 4606 return FAIL; |
| 3562 | 4607 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4608 if (remove_comments) | |
| 4609 { | |
| 4610 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
| 4611 if (comments == NULL) | |
| 4612 { | |
| 4613 vim_free(spaces); | |
| 4614 return FAIL; | |
| 4615 } | |
| 4616 } | |
| 4617 #endif | |
| 7 | 4618 |
| 4619 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4620 * Don't move anything, just compute the final line length |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4621 * and setup the array of space strings lengths |
| 7 | 4622 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4623 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
|
4624 { |
| 2597 | 4625 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
| 5848 | 4626 if (t == 0 && setmark) |
| 5664 | 4627 { |
| 4628 /* Set the '[ mark. */ | |
| 4629 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
| 4630 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
| 4631 } | |
| 3562 | 4632 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4633 if (remove_comments) | |
| 4634 { | |
| 4635 /* We don't want to remove the comment leader if the | |
| 4636 * previous line is not a comment. */ | |
| 4637 if (t > 0 && prev_was_comment) | |
| 4638 { | |
| 4639 | |
| 4640 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
| 4641 &prev_was_comment); | |
| 3576 | 4642 comments[t] = (int)(new_curr - curr); |
| 3562 | 4643 curr = new_curr; |
| 4644 } | |
| 4645 else | |
| 4646 curr = skip_comment(curr, FALSE, insert_space, | |
| 4647 &prev_was_comment); | |
| 4648 } | |
| 4649 #endif | |
| 4650 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4651 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
|
4652 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4653 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4654 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
|
4655 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 && (!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
|
4657 || (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
|
4658 && (!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
|
4659 || 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
|
4660 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4661 ) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4662 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 /* 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
|
4664 if (endcurr1 == ' ') |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4665 endcurr1 = endcurr2; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4666 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4667 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4668 /* 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
|
4669 if ( p_js |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4670 && (endcurr1 == '.' |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4671 || (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
|
4672 && (endcurr1 == '?' || endcurr1 == '!')))) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4673 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4674 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4675 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4676 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4677 sumsize += currsize + spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4678 endcurr1 = endcurr2 = NUL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4679 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
|
4680 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4681 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4682 if (has_mbyte) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4683 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4684 cend = curr + currsize; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4685 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
|
4686 endcurr1 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4687 if (cend > curr) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4688 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4689 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
|
4690 endcurr2 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4691 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4692 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4693 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4694 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4695 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4696 endcurr1 = *(curr + currsize - 1); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4697 if (currsize > 1) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4698 endcurr2 = *(curr + currsize - 2); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4699 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4700 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4701 line_breakcheck(); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4702 if (got_int) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4703 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4704 ret = FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4705 goto theend; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4706 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4707 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4708 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4709 /* 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
|
4710 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
|
4711 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4712 /* allocate the space for the new line */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4713 newp = alloc_check((unsigned)(sumsize + 1)); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4714 cend = newp + sumsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4715 *cend = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4716 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4717 /* |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4718 * Move affected lines to the new long one. |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4719 * |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4720 * 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
|
4721 * 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
|
4722 * 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
|
4723 */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4724 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
|
4725 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4726 cend -= currsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4727 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
|
4728 if (spaces[t] > 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4729 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4730 cend -= spaces[t]; |
| 6929 | 4731 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
|
4732 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4733 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
| 2597 | 4734 (long)(cend - newp + spaces[t] - (curr - curr_start))); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4735 if (t == 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4736 break; |
| 2597 | 4737 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
| 3562 | 4738 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4739 if (remove_comments) | |
| 4740 curr += comments[t - 1]; | |
| 4741 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4742 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
|
4743 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4744 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4745 } |
| 7 | 4746 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
| 4747 | |
| 5848 | 4748 if (setmark) |
| 4749 { | |
| 4750 /* Set the '] mark. */ | |
| 4751 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
| 4752 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
| 4753 } | |
| 5664 | 4754 |
| 7 | 4755 /* Only report the change in the first line here, del_lines() will report |
| 4756 * the deleted line. */ | |
| 4757 changed_lines(curwin->w_cursor.lnum, currsize, | |
| 4758 curwin->w_cursor.lnum + 1, 0L); | |
| 4759 | |
| 4760 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4761 * Delete following lines. To do this we move the cursor there |
| 7 | 4762 * briefly, and then move it back. After del_lines() the cursor may |
| 4763 * have moved up (last line deleted), so the current lnum is kept in t. | |
| 4764 */ | |
| 4765 t = curwin->w_cursor.lnum; | |
| 4766 ++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
|
4767 del_lines(count - 1, FALSE); |
| 7 | 4768 curwin->w_cursor.lnum = t; |
| 4769 | |
| 4770 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4771 * Set the cursor column: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4772 * 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
|
4773 * vim: use the column of the last join |
| 7 | 4774 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4775 curwin->w_cursor.col = |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4776 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
| 7 | 4777 check_cursor_col(); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4778 |
| 7 | 4779 #ifdef FEAT_VIRTUALEDIT |
| 4780 curwin->w_cursor.coladd = 0; | |
| 4781 #endif | |
| 4782 curwin->w_set_curswant = TRUE; | |
| 4783 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4784 theend: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4785 vim_free(spaces); |
| 3562 | 4786 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4787 if (remove_comments) | |
| 4788 vim_free(comments); | |
| 4789 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4790 return ret; |
| 7 | 4791 } |
| 4792 | |
| 4793 #ifdef FEAT_COMMENTS | |
| 4794 /* | |
| 4795 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
| 4796 * the first line. White-space is ignored. Note that the whole of | |
| 4797 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
| 4798 */ | |
| 4799 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4800 same_leader( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4801 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4802 int leader1_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4803 char_u *leader1_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4804 int leader2_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4805 char_u *leader2_flags) |
| 7 | 4806 { |
| 4807 int idx1 = 0, idx2 = 0; | |
| 4808 char_u *p; | |
| 4809 char_u *line1; | |
| 4810 char_u *line2; | |
| 4811 | |
| 4812 if (leader1_len == 0) | |
| 4813 return (leader2_len == 0); | |
| 4814 | |
| 4815 /* | |
| 4816 * If first leader has 'f' flag, the lines can be joined only if the | |
| 4817 * second line does not have a leader. | |
| 4818 * If first leader has 'e' flag, the lines can never be joined. | |
| 4819 * If fist leader has 's' flag, the lines can only be joined if there is | |
| 4820 * some text after it and the second line has the 'm' flag. | |
| 4821 */ | |
| 4822 if (leader1_flags != NULL) | |
| 4823 { | |
| 4824 for (p = leader1_flags; *p && *p != ':'; ++p) | |
| 4825 { | |
| 4826 if (*p == COM_FIRST) | |
| 4827 return (leader2_len == 0); | |
| 4828 if (*p == COM_END) | |
| 4829 return FALSE; | |
| 4830 if (*p == COM_START) | |
| 4831 { | |
| 4832 if (*(ml_get(lnum) + leader1_len) == NUL) | |
| 4833 return FALSE; | |
| 4834 if (leader2_flags == NULL || leader2_len == 0) | |
| 4835 return FALSE; | |
| 4836 for (p = leader2_flags; *p && *p != ':'; ++p) | |
| 4837 if (*p == COM_MIDDLE) | |
| 4838 return TRUE; | |
| 4839 return FALSE; | |
| 4840 } | |
| 4841 } | |
| 4842 } | |
| 4843 | |
| 4844 /* | |
| 4845 * Get current line and next line, compare the leaders. | |
| 4846 * The first line has to be saved, only one line can be locked at a time. | |
| 4847 */ | |
| 4848 line1 = vim_strsave(ml_get(lnum)); | |
| 4849 if (line1 != NULL) | |
| 4850 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4851 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
| 7 | 4852 ; |
| 4853 line2 = ml_get(lnum + 1); | |
| 4854 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
| 4855 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4856 if (!VIM_ISWHITE(line2[idx2])) |
| 7 | 4857 { |
| 4858 if (line1[idx1++] != line2[idx2]) | |
| 4859 break; | |
| 4860 } | |
| 4861 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4862 while (VIM_ISWHITE(line1[idx1])) |
| 7 | 4863 ++idx1; |
| 4864 } | |
| 4865 vim_free(line1); | |
| 4866 } | |
| 4867 return (idx2 == leader2_len && idx1 == leader1_len); | |
| 4868 } | |
| 4869 #endif | |
| 4870 | |
| 4871 /* | |
| 3252 | 4872 * Implementation of the format operator 'gq'. |
| 7 | 4873 */ |
| 4874 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4875 op_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4876 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4877 int keep_cursor) /* keep cursor on same text char */ |
| 7 | 4878 { |
| 4879 long old_line_count = curbuf->b_ml.ml_line_count; | |
| 4880 | |
| 4881 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
| 4882 * can put it back there. */ | |
| 4883 curwin->w_cursor = oap->cursor_start; | |
| 4884 | |
| 4885 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 4886 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 4887 return; | |
| 4888 curwin->w_cursor = oap->start; | |
| 4889 | |
| 4890 if (oap->is_VIsual) | |
| 4891 /* When there is no change: need to remove the Visual selection */ | |
| 4892 redraw_curbuf_later(INVERTED); | |
| 4893 | |
| 4894 /* Set '[ mark at the start of the formatted area */ | |
| 4895 curbuf->b_op_start = oap->start; | |
| 4896 | |
| 4897 /* For "gw" remember the cursor position and put it back below (adjusted | |
| 4898 * for joined and split lines). */ | |
| 4899 if (keep_cursor) | |
| 4900 saved_cursor = oap->cursor_start; | |
| 4901 | |
| 1563 | 4902 format_lines(oap->line_count, keep_cursor); |
| 7 | 4903 |
| 4904 /* | |
| 4905 * Leave the cursor at the first non-blank of the last formatted line. | |
| 4906 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
| 4907 * line, so "." will do the next lines. | |
| 4908 */ | |
| 4909 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 4910 ++curwin->w_cursor.lnum; | |
| 4911 beginline(BL_WHITE | BL_FIX); | |
| 4912 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
| 4913 msgmore(old_line_count); | |
| 4914 | |
| 4915 /* put '] mark on the end of the formatted area */ | |
| 4916 curbuf->b_op_end = curwin->w_cursor; | |
| 4917 | |
| 4918 if (keep_cursor) | |
| 4919 { | |
| 4920 curwin->w_cursor = saved_cursor; | |
| 4921 saved_cursor.lnum = 0; | |
| 4922 } | |
| 4923 | |
| 4924 if (oap->is_VIsual) | |
| 4925 { | |
| 4926 win_T *wp; | |
| 4927 | |
| 4928 FOR_ALL_WINDOWS(wp) | |
| 4929 { | |
| 4930 if (wp->w_old_cursor_lnum != 0) | |
| 4931 { | |
| 4932 /* When lines have been inserted or deleted, adjust the end of | |
| 4933 * the Visual area to be redrawn. */ | |
| 4934 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
| 4935 wp->w_old_cursor_lnum += old_line_count; | |
| 4936 else | |
| 4937 wp->w_old_visual_lnum += old_line_count; | |
| 4938 } | |
| 4939 } | |
| 4940 } | |
| 4941 } | |
| 4942 | |
| 667 | 4943 #if defined(FEAT_EVAL) || defined(PROTO) |
| 4944 /* | |
| 4945 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
| 4946 */ | |
| 4947 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4948 op_formatexpr(oparg_T *oap) |
| 667 | 4949 { |
| 4950 if (oap->is_VIsual) | |
| 4951 /* When there is no change: need to remove the Visual selection */ | |
| 4952 redraw_curbuf_later(INVERTED); | |
| 4953 | |
|
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4954 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
|
4955 /* 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
|
4956 * internal formatting. */ |
|
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4957 op_format(oap, FALSE); |
| 667 | 4958 } |
| 4959 | |
| 4960 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4961 fex_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4962 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4963 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4964 int c) /* character to be inserted */ |
| 667 | 4965 { |
| 681 | 4966 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
| 4967 OPT_LOCAL); | |
| 667 | 4968 int r; |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4969 char_u *fex; |
| 667 | 4970 |
| 4971 /* | |
| 4972 * Set v:lnum to the first line number and v:count to the number of lines. | |
| 844 | 4973 * Set v:char to the character to be inserted (can be NUL). |
| 667 | 4974 */ |
| 4975 set_vim_var_nr(VV_LNUM, lnum); | |
| 4976 set_vim_var_nr(VV_COUNT, count); | |
| 1969 | 4977 set_vim_var_char(c); |
| 844 | 4978 |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4979 /* 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
|
4980 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
|
4981 if (fex == NULL) |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4982 return 0; |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4983 |
| 667 | 4984 /* |
| 4985 * Evaluate the function. | |
| 4986 */ | |
| 4987 if (use_sandbox) | |
| 4988 ++sandbox; | |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4989 r = (int)eval_to_number(fex); |
| 667 | 4990 if (use_sandbox) |
| 4991 --sandbox; | |
| 844 | 4992 |
| 4993 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
|
4994 vim_free(fex); |
| 844 | 4995 |
| 667 | 4996 return r; |
| 4997 } | |
| 4998 #endif | |
| 4999 | |
| 7 | 5000 /* |
| 5001 * Format "line_count" lines, starting at the cursor position. | |
| 5002 * When "line_count" is negative, format until the end of the paragraph. | |
| 5003 * Lines after the cursor line are saved for undo, caller must have saved the | |
| 5004 * first line. | |
| 5005 */ | |
| 5006 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5007 format_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5008 linenr_T line_count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5009 int avoid_fex) /* don't use 'formatexpr' */ |
| 7 | 5010 { |
| 5011 int max_len; | |
| 5012 int is_not_par; /* current line not part of parag. */ | |
| 5013 int next_is_not_par; /* next line not part of paragraph */ | |
| 5014 int is_end_par; /* at end of paragraph */ | |
| 5015 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
| 5016 int next_is_start_par = FALSE; | |
| 5017 #ifdef FEAT_COMMENTS | |
| 5018 int leader_len = 0; /* leader len of current line */ | |
| 5019 int next_leader_len; /* leader len of next line */ | |
| 5020 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5021 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5022 int do_comments; /* format comments */ | |
| 3584 | 5023 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
| 7 | 5024 #endif |
| 5025 int advance = TRUE; | |
| 3584 | 5026 int second_indent = -1; /* indent for second line (comment |
| 5027 * aware) */ | |
| 7 | 5028 int do_second_indent; |
| 5029 int do_number_indent; | |
| 5030 int do_trail_white; | |
| 5031 int first_par_line = TRUE; | |
| 5032 int smd_save; | |
| 5033 long count; | |
| 5034 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
| 5035 int force_format = FALSE; | |
| 5036 int old_State = State; | |
| 5037 | |
| 5038 /* length of a line to force formatting: 3 * 'tw' */ | |
| 5039 max_len = comp_textwidth(TRUE) * 3; | |
| 5040 | |
| 5041 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
| 5042 #ifdef FEAT_COMMENTS | |
| 5043 do_comments = has_format_option(FO_Q_COMS); | |
| 5044 #endif | |
| 5045 do_second_indent = has_format_option(FO_Q_SECOND); | |
| 5046 do_number_indent = has_format_option(FO_Q_NUMBER); | |
| 5047 do_trail_white = has_format_option(FO_WHITE_PAR); | |
| 5048 | |
| 5049 /* | |
| 5050 * Get info about the previous and current line. | |
| 5051 */ | |
| 5052 if (curwin->w_cursor.lnum > 1) | |
| 5053 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
| 5054 #ifdef FEAT_COMMENTS | |
| 5055 , &leader_len, &leader_flags, do_comments | |
| 5056 #endif | |
| 5057 ); | |
| 5058 else | |
| 5059 is_not_par = TRUE; | |
| 5060 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
| 5061 #ifdef FEAT_COMMENTS | |
| 5062 , &next_leader_len, &next_leader_flags, do_comments | |
| 5063 #endif | |
| 5064 ); | |
| 5065 is_end_par = (is_not_par || next_is_not_par); | |
| 5066 if (!is_end_par && do_trail_white) | |
| 5067 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
| 5068 | |
| 5069 curwin->w_cursor.lnum--; | |
| 5070 for (count = line_count; count != 0 && !got_int; --count) | |
| 5071 { | |
| 5072 /* | |
| 5073 * Advance to next paragraph. | |
| 5074 */ | |
| 5075 if (advance) | |
| 5076 { | |
| 5077 curwin->w_cursor.lnum++; | |
| 5078 prev_is_end_par = is_end_par; | |
| 5079 is_not_par = next_is_not_par; | |
| 5080 #ifdef FEAT_COMMENTS | |
| 5081 leader_len = next_leader_len; | |
| 5082 leader_flags = next_leader_flags; | |
| 5083 #endif | |
| 5084 } | |
| 5085 | |
| 5086 /* | |
| 5087 * The last line to be formatted. | |
| 5088 */ | |
| 5089 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 5090 { | |
| 5091 next_is_not_par = TRUE; | |
| 5092 #ifdef FEAT_COMMENTS | |
| 5093 next_leader_len = 0; | |
| 5094 next_leader_flags = NULL; | |
| 5095 #endif | |
| 5096 } | |
| 5097 else | |
| 5098 { | |
| 5099 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
| 5100 #ifdef FEAT_COMMENTS | |
| 5101 , &next_leader_len, &next_leader_flags, do_comments | |
| 5102 #endif | |
| 5103 ); | |
| 5104 if (do_number_indent) | |
| 5105 next_is_start_par = | |
| 5106 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
| 5107 } | |
| 5108 advance = TRUE; | |
| 5109 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
| 5110 if (!is_end_par && do_trail_white) | |
| 5111 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
| 5112 | |
| 5113 /* | |
| 5114 * Skip lines that are not in a paragraph. | |
| 5115 */ | |
| 5116 if (is_not_par) | |
| 5117 { | |
| 5118 if (line_count < 0) | |
| 5119 break; | |
| 5120 } | |
| 5121 else | |
| 5122 { | |
| 5123 /* | |
| 5124 * For the first line of a paragraph, check indent of second line. | |
| 5125 * Don't do this for comments and empty lines. | |
| 5126 */ | |
| 5127 if (first_par_line | |
| 5128 && (do_second_indent || do_number_indent) | |
| 5129 && prev_is_end_par | |
| 3584 | 5130 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
| 5131 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5132 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
| 3584 | 5133 { |
| 5134 #ifdef FEAT_COMMENTS | |
| 5135 if (leader_len == 0 && next_leader_len == 0) | |
| 5136 { | |
| 5137 /* no comment found */ | |
| 5138 #endif | |
| 5139 second_indent = | |
| 5140 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
| 7 | 5141 #ifdef FEAT_COMMENTS |
| 3584 | 5142 } |
| 5143 else | |
| 5144 { | |
| 5145 second_indent = next_leader_len; | |
| 5146 do_comments_list = 1; | |
| 5147 } | |
| 5148 #endif | |
| 5149 } | |
| 7 | 5150 else if (do_number_indent) |
| 3584 | 5151 { |
| 5152 #ifdef FEAT_COMMENTS | |
| 5153 if (leader_len == 0 && next_leader_len == 0) | |
| 5154 { | |
| 5155 /* no comment found */ | |
| 5156 #endif | |
| 5157 second_indent = | |
| 5158 get_number_indent(curwin->w_cursor.lnum); | |
| 5159 #ifdef FEAT_COMMENTS | |
| 5160 } | |
| 5161 else | |
| 5162 { | |
| 5163 /* get_number_indent() is now "comment aware"... */ | |
| 5164 second_indent = | |
| 5165 get_number_indent(curwin->w_cursor.lnum); | |
| 5166 do_comments_list = 1; | |
| 5167 } | |
| 5168 #endif | |
| 5169 } | |
| 7 | 5170 } |
| 5171 | |
| 5172 /* | |
| 5173 * When the comment leader changes, it's the end of the paragraph. | |
| 5174 */ | |
| 5175 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
| 5176 #ifdef FEAT_COMMENTS | |
| 5177 || !same_leader(curwin->w_cursor.lnum, | |
| 5178 leader_len, leader_flags, | |
| 5179 next_leader_len, next_leader_flags) | |
| 5180 #endif | |
| 5181 ) | |
| 5182 is_end_par = TRUE; | |
| 5183 | |
| 5184 /* | |
| 5185 * If we have got to the end of a paragraph, or the line is | |
| 5186 * getting long, format it. | |
| 5187 */ | |
| 5188 if (is_end_par || force_format) | |
| 5189 { | |
| 5190 if (need_set_indent) | |
| 5191 /* replace indent in first line with minimal number of | |
| 5192 * tabs and spaces, according to current options */ | |
| 5193 (void)set_indent(get_indent(), SIN_CHANGED); | |
| 5194 | |
| 5195 /* put cursor on last non-space */ | |
| 5196 State = NORMAL; /* don't go past end-of-line */ | |
| 5197 coladvance((colnr_T)MAXCOL); | |
| 5198 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
| 5199 dec_cursor(); | |
| 5200 | |
| 5201 /* do the formatting, without 'showmode' */ | |
| 5202 State = INSERT; /* for open_line() */ | |
| 5203 smd_save = p_smd; | |
| 5204 p_smd = FALSE; | |
| 5205 insertchar(NUL, INSCHAR_FORMAT | |
| 5206 #ifdef FEAT_COMMENTS | |
| 5207 + (do_comments ? INSCHAR_DO_COM : 0) | |
| 3584 | 5208 + (do_comments && do_comments_list |
| 5209 ? INSCHAR_COM_LIST : 0) | |
| 7 | 5210 #endif |
| 1563 | 5211 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
| 7 | 5212 State = old_State; |
| 5213 p_smd = smd_save; | |
| 5214 second_indent = -1; | |
| 5215 /* at end of par.: need to set indent of next par. */ | |
| 5216 need_set_indent = is_end_par; | |
| 5217 if (is_end_par) | |
| 5218 { | |
| 5219 /* When called with a negative line count, break at the | |
| 5220 * end of the paragraph. */ | |
| 5221 if (line_count < 0) | |
| 5222 break; | |
| 5223 first_par_line = TRUE; | |
| 5224 } | |
| 5225 force_format = FALSE; | |
| 5226 } | |
| 5227 | |
| 5228 /* | |
| 5229 * When still in same paragraph, join the lines together. But | |
| 5403 | 5230 * first delete the leader from the second line. |
| 7 | 5231 */ |
| 5232 if (!is_end_par) | |
| 5233 { | |
| 5234 advance = FALSE; | |
| 5235 curwin->w_cursor.lnum++; | |
| 5236 curwin->w_cursor.col = 0; | |
| 5237 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
|
5238 break; |
| 7 | 5239 #ifdef FEAT_COMMENTS |
| 5240 if (next_leader_len > 0) | |
| 5403 | 5241 { |
| 5242 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
| 7 | 5243 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
| 5244 (long)-next_leader_len); | |
| 5403 | 5245 } else |
| 5246 #endif | |
| 5247 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
| 5248 { | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5249 int indent = getwhitecols_curline(); |
| 5403 | 5250 |
| 5251 if (indent > 0) | |
| 5252 { | |
| 5253 (void)del_bytes(indent, FALSE, FALSE); | |
| 5254 mark_col_adjust(curwin->w_cursor.lnum, | |
| 5255 (colnr_T)0, 0L, (long)-indent); | |
| 5415 | 5256 } |
| 5403 | 5257 } |
| 7 | 5258 curwin->w_cursor.lnum--; |
| 5848 | 5259 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
| 7 | 5260 { |
| 5261 beep_flush(); | |
| 5262 break; | |
| 5263 } | |
| 5264 first_par_line = FALSE; | |
| 5265 /* If the line is getting long, format it next time */ | |
| 5266 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
| 5267 force_format = TRUE; | |
| 5268 else | |
| 5269 force_format = FALSE; | |
| 5270 } | |
| 5271 } | |
| 5272 line_breakcheck(); | |
| 5273 } | |
| 5274 } | |
| 5275 | |
| 5276 /* | |
| 5277 * Return TRUE if line "lnum" ends in a white character. | |
| 5278 */ | |
| 5279 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5280 ends_in_white(linenr_T lnum) |
| 7 | 5281 { |
| 5282 char_u *s = ml_get(lnum); | |
| 5283 size_t l; | |
| 5284 | |
| 5285 if (*s == NUL) | |
| 5286 return FALSE; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5287 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
| 7 | 5288 * invocation may call function multiple times". */ |
| 5289 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
|
5290 return VIM_ISWHITE(s[l]); |
| 7 | 5291 } |
| 5292 | |
| 5293 /* | |
| 5294 * Blank lines, and lines containing only the comment leader, are left | |
| 5295 * untouched by the formatting. The function returns TRUE in this | |
| 5296 * case. It also returns TRUE when a line starts with the end of a comment | |
| 5297 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
| 5298 * previous line. A new paragraph starts after a blank line, or when the | |
| 5299 * comment leader changes -- webb. | |
| 5300 */ | |
| 5301 #ifdef FEAT_COMMENTS | |
| 5302 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5303 fmt_check_par( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5304 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5305 int *leader_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5306 char_u **leader_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5307 int do_comments) |
| 7 | 5308 { |
| 5309 char_u *flags = NULL; /* init for GCC */ | |
| 5310 char_u *ptr; | |
| 5311 | |
| 5312 ptr = ml_get(lnum); | |
| 5313 if (do_comments) | |
| 3562 | 5314 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
| 7 | 5315 else |
| 5316 *leader_len = 0; | |
| 5317 | |
| 5318 if (*leader_len > 0) | |
| 5319 { | |
| 5320 /* | |
| 5321 * Search for 'e' flag in comment leader flags. | |
| 5322 */ | |
| 5323 flags = *leader_flags; | |
| 5324 while (*flags && *flags != ':' && *flags != COM_END) | |
| 5325 ++flags; | |
| 5326 } | |
| 5327 | |
| 5328 return (*skipwhite(ptr + *leader_len) == NUL | |
| 5329 || (*leader_len > 0 && *flags == COM_END) | |
| 5330 || startPS(lnum, NUL, FALSE)); | |
| 5331 } | |
| 5332 #else | |
| 5333 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5334 fmt_check_par(linenr_T lnum) |
| 7 | 5335 { |
| 5336 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
| 5337 } | |
| 5338 #endif | |
| 5339 | |
| 5340 /* | |
| 5341 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
| 5342 * previous line is in the same paragraph. Used for auto-formatting. | |
| 5343 */ | |
| 5344 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5345 paragraph_start(linenr_T lnum) |
| 7 | 5346 { |
| 5347 char_u *p; | |
| 5348 #ifdef FEAT_COMMENTS | |
| 5349 int leader_len = 0; /* leader len of current line */ | |
| 5350 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5351 int next_leader_len; /* leader len of next line */ | |
| 5352 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5353 int do_comments; /* format comments */ | |
| 5354 #endif | |
| 5355 | |
| 5356 if (lnum <= 1) | |
| 5357 return TRUE; /* start of the file */ | |
| 5358 | |
| 5359 p = ml_get(lnum - 1); | |
| 5360 if (*p == NUL) | |
| 5361 return TRUE; /* after empty line */ | |
| 5362 | |
| 5363 #ifdef FEAT_COMMENTS | |
| 5364 do_comments = has_format_option(FO_Q_COMS); | |
| 5365 #endif | |
| 5366 if (fmt_check_par(lnum - 1 | |
| 5367 #ifdef FEAT_COMMENTS | |
| 5368 , &leader_len, &leader_flags, do_comments | |
| 5369 #endif | |
| 5370 )) | |
| 5371 return TRUE; /* after non-paragraph line */ | |
| 5372 | |
| 5373 if (fmt_check_par(lnum | |
| 5374 #ifdef FEAT_COMMENTS | |
| 5375 , &next_leader_len, &next_leader_flags, do_comments | |
| 5376 #endif | |
| 5377 )) | |
| 5378 return TRUE; /* "lnum" is not a paragraph line */ | |
| 5379 | |
| 5380 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
| 5381 return TRUE; /* missing trailing space in previous line. */ | |
| 5382 | |
| 5383 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
| 5384 return TRUE; /* numbered item starts in "lnum". */ | |
| 5385 | |
| 5386 #ifdef FEAT_COMMENTS | |
| 5387 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
| 5388 next_leader_len, next_leader_flags)) | |
| 5389 return TRUE; /* change of comment leader. */ | |
| 5390 #endif | |
| 5391 | |
| 5392 return FALSE; | |
| 5393 } | |
| 5394 | |
| 5395 /* | |
| 5396 * prepare a few things for block mode yank/delete/tilde | |
| 5397 * | |
| 5398 * for delete: | |
| 5399 * - textlen includes the first/last char to be (partly) deleted | |
| 5400 * - start/endspaces is the number of columns that are taken by the | |
| 5401 * first/last deleted char minus the number of columns that have to be | |
| 1839 | 5402 * deleted. |
| 5403 * for yank and tilde: | |
| 7 | 5404 * - textlen includes the first/last char to be wholly yanked |
| 5405 * - start/endspaces is the number of columns of the first/last yanked char | |
| 5406 * that are to be yanked. | |
| 5407 */ | |
| 5408 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5409 block_prep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5410 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5411 struct block_def *bdp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5412 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5413 int is_del) |
| 7 | 5414 { |
| 5415 int incr = 0; | |
| 5416 char_u *pend; | |
| 5417 char_u *pstart; | |
| 5418 char_u *line; | |
| 5419 char_u *prev_pstart; | |
| 5420 char_u *prev_pend; | |
| 5421 | |
| 5422 bdp->startspaces = 0; | |
| 5423 bdp->endspaces = 0; | |
| 5424 bdp->textlen = 0; | |
| 5425 bdp->start_vcol = 0; | |
| 5426 bdp->end_vcol = 0; | |
| 5427 #ifdef FEAT_VISUALEXTRA | |
| 5428 bdp->is_short = FALSE; | |
| 5429 bdp->is_oneChar = FALSE; | |
| 5430 bdp->pre_whitesp = 0; | |
| 5431 bdp->pre_whitesp_c = 0; | |
| 5432 bdp->end_char_vcols = 0; | |
| 5433 #endif | |
| 5434 bdp->start_char_vcols = 0; | |
| 5435 | |
| 5436 line = ml_get(lnum); | |
| 5437 pstart = line; | |
| 5438 prev_pstart = line; | |
| 5439 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
| 5440 { | |
| 5441 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 5442 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
| 7 | 5443 bdp->start_vcol += incr; |
| 5444 #ifdef FEAT_VISUALEXTRA | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5445 if (VIM_ISWHITE(*pstart)) |
| 7 | 5446 { |
| 5447 bdp->pre_whitesp += incr; | |
| 5448 bdp->pre_whitesp_c++; | |
| 5449 } | |
| 5450 else | |
| 5451 { | |
| 5452 bdp->pre_whitesp = 0; | |
| 5453 bdp->pre_whitesp_c = 0; | |
| 5454 } | |
| 5455 #endif | |
| 5456 prev_pstart = pstart; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5457 MB_PTR_ADV(pstart); |
| 7 | 5458 } |
| 5459 bdp->start_char_vcols = incr; | |
| 5460 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
| 5461 { | |
| 5462 bdp->end_vcol = bdp->start_vcol; | |
| 5463 #ifdef FEAT_VISUALEXTRA | |
| 5464 bdp->is_short = TRUE; | |
| 5465 #endif | |
| 5466 if (!is_del || oap->op_type == OP_APPEND) | |
| 5467 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5468 } | |
| 5469 else | |
| 5470 { | |
| 5471 /* notice: this converts partly selected Multibyte characters to | |
| 5472 * spaces, too. */ | |
| 5473 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
| 5474 if (is_del && bdp->startspaces) | |
| 5475 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5476 pend = pstart; | |
| 5477 bdp->end_vcol = bdp->start_vcol; | |
| 5478 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
| 5479 { | |
| 5480 #ifdef FEAT_VISUALEXTRA | |
| 5481 bdp->is_oneChar = TRUE; | |
| 5482 #endif | |
| 5483 if (oap->op_type == OP_INSERT) | |
| 5484 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5485 else if (oap->op_type == OP_APPEND) | |
| 5486 { | |
| 5487 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
| 5488 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5489 } | |
| 5490 else | |
| 5491 { | |
| 5492 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5493 if (is_del && oap->op_type != OP_LSHIFT) | |
| 5494 { | |
| 5495 /* just putting the sum of those two into | |
| 5496 * bdp->startspaces doesn't work for Visual replace, | |
| 5497 * so we have to split the tab in two */ | |
| 5498 bdp->startspaces = bdp->start_char_vcols | |
| 5499 - (bdp->start_vcol - oap->start_vcol); | |
| 5500 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5501 } | |
| 5502 } | |
| 5503 } | |
| 5504 else | |
| 5505 { | |
| 5506 prev_pend = pend; | |
| 5507 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
| 5508 { | |
| 5509 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5510 prev_pend = pend; | |
| 6535 | 5511 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
| 7 | 5512 bdp->end_vcol += incr; |
| 5513 } | |
| 5514 if (bdp->end_vcol <= oap->end_vcol | |
| 5515 && (!is_del | |
| 5516 || oap->op_type == OP_APPEND | |
| 5517 || oap->op_type == OP_REPLACE)) /* line too short */ | |
| 5518 { | |
| 5519 #ifdef FEAT_VISUALEXTRA | |
| 5520 bdp->is_short = TRUE; | |
| 5521 #endif | |
| 5522 /* Alternative: include spaces to fill up the block. | |
| 5523 * Disadvantage: can lead to trailing spaces when the line is | |
| 5524 * short where the text is put */ | |
| 5525 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
| 5526 if (oap->op_type == OP_APPEND || virtual_op) | |
| 5527 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
| 593 | 5528 + oap->inclusive; |
| 7 | 5529 else |
| 5530 bdp->endspaces = 0; /* replace doesn't add characters */ | |
| 5531 } | |
| 5532 else if (bdp->end_vcol > oap->end_vcol) | |
| 5533 { | |
| 5534 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5535 if (!is_del && bdp->endspaces) | |
| 5536 { | |
| 5537 bdp->endspaces = incr - bdp->endspaces; | |
| 5538 if (pend != pstart) | |
| 5539 pend = prev_pend; | |
| 5540 } | |
| 5541 } | |
| 5542 } | |
| 5543 #ifdef FEAT_VISUALEXTRA | |
| 5544 bdp->end_char_vcols = incr; | |
| 5545 #endif | |
| 5546 if (is_del && bdp->startspaces) | |
| 5547 pstart = prev_pstart; | |
| 5548 bdp->textlen = (int)(pend - pstart); | |
| 5549 } | |
| 5550 bdp->textcol = (colnr_T) (pstart - line); | |
| 5551 bdp->textstart = pstart; | |
| 5552 } | |
| 5553 | |
| 5554 /* | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5555 * Handle the add/subtract operator. |
| 7 | 5556 */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5558 op_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5559 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5560 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
|
5561 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
|
5562 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5563 pos_T pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5564 struct block_def bd; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5565 int change_cnt = 0; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5566 linenr_T amount = Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5567 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5568 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5569 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5570 pos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5571 if (u_save_cursor() == FAIL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5572 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5573 change_cnt = do_addsub(oap->op_type, &pos, 0, amount); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5574 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5575 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
|
5576 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5577 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5578 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5579 int one_change; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5580 int length; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5581 pos_T startpos; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5582 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5583 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
|
5584 (linenr_T)(oap->end.lnum + 1)) == FAIL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5585 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5586 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5587 pos = oap->start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5588 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
|
5589 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5590 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
|
5591 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5592 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
|
5593 pos.col = bd.textcol; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5594 length = bd.textlen; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5595 } |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5596 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
|
5597 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5598 curwin->w_cursor.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5599 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5600 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
|
5601 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5602 else /* oap->motion_type == MCHAR */ |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5603 { |
|
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5604 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
|
5605 dec(&(oap->end)); |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5606 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
|
5607 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5608 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
|
5609 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5610 pos.col += oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5611 length -= oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5612 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5613 if (pos.lnum == oap->end.lnum) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5614 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5615 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
|
5616 if (oap->end.col >= length) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5617 oap->end.col = length - 1; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5618 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
|
5619 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5620 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5621 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
|
5622 if (one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5623 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5624 /* 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
|
5625 if (change_cnt == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5626 startpos = curbuf->b_op_start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5627 ++change_cnt; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5628 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5629 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 #ifdef FEAT_NETBEANS_INTG |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5631 if (netbeans_active() && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5633 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
|
5634 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5635 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
|
5636 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
|
5637 &ptr[pos.col], length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5639 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 if (g_cmd && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 amount += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5643 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5644 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
|
5645 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5646 if (!change_cnt && oap->is_VIsual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5647 /* 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
|
5648 redraw_curbuf_later(INVERTED); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 /* 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
|
5651 * position from do_addsub(). */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5652 if (change_cnt > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 curbuf->b_op_start = startpos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5654 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5655 if (change_cnt > p_report) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5656 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5657 if (change_cnt == 1) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 MSG(_("1 line changed")); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 smsg((char_u *)_("%ld lines changed"), change_cnt); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5666 * 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
|
5667 * 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
|
5668 * |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 * 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
|
5670 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5671 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5672 do_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5673 int op_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5674 pos_T *pos, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5675 int length, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5676 linenr_T Prenum1) |
| 7 | 5677 { |
| 5678 int col; | |
| 5679 char_u *buf1; | |
| 5680 char_u buf2[NUMBUFLEN]; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5681 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
| 7 | 5682 static int hexupper = FALSE; /* 0xABC */ |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5683 uvarnumber_T n; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5684 uvarnumber_T oldn; |
| 7 | 5685 char_u *ptr; |
| 5686 int c; | |
| 5687 int todel; | |
| 5688 int dohex; | |
| 5689 int dooct; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5690 int dobin; |
| 7 | 5691 int doalp; |
| 5692 int firstdigit; | |
| 5693 int subtract; | |
| 6868 | 5694 int negative = FALSE; |
| 6891 | 5695 int was_positive = TRUE; |
| 6868 | 5696 int visual = VIsual_active; |
| 6921 | 5697 int did_change = FALSE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5698 pos_T save_cursor = curwin->w_cursor; |
| 6927 | 5699 int maxlen = 0; |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5700 pos_T startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5701 pos_T endpos; |
| 7 | 5702 |
| 5703 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
| 5704 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
|
5705 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
| 7 | 5706 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
| 5707 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 curwin->w_cursor = *pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 ptr = ml_get(pos->lnum); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 col = pos->col; |
|
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 if (*ptr == NUL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 |
| 7 | 5715 /* |
| 5716 * First check if we are on a hexadecimal number, after the "0x". | |
| 5717 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5720 if (dobin) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5721 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
|
5722 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5723 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5724 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5725 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5726 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
|
5727 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5728 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5729 |
| 6868 | 5730 if (dohex) |
| 5731 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
|
5732 { |
| 6868 | 5733 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5734 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5735 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5736 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
|
5737 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5738 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5739 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5740 if ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5741 && dohex |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5742 && ! ((col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5743 && (ptr[col] == 'X' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5744 || ptr[col] == 'x') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5745 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5746 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5747 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5748 !(*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
|
5749 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5750 && vim_isxdigit(ptr[col + 1])))) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5751 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5752 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5753 /* 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
|
5754 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 col = pos->col; |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5756 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5757 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
|
5758 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5759 col--; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5760 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5761 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5762 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
|
5763 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5764 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5765 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5766 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5767 if (( dohex |
| 6868 | 5768 && col > 0 |
| 5769 && (ptr[col] == 'X' | |
| 5770 || ptr[col] == 'x') | |
| 5771 && ptr[col - 1] == '0' | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5772 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5773 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5774 !(*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
|
5775 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5776 && vim_isxdigit(ptr[col + 1])) || |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5777 ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5778 && col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5779 && (ptr[col] == 'B' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5780 || ptr[col] == 'b') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5781 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5782 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5783 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5784 !(*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
|
5785 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5786 && vim_isbdigit(ptr[col + 1]))) |
| 6868 | 5787 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5788 /* Found hexadecimal or binary number, move to its start. */ |
| 7 | 5789 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5790 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5791 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5792 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
|
5793 #endif |
| 6868 | 5794 } |
| 5795 else | |
| 7 | 5796 { |
| 6868 | 5797 /* |
| 5798 * Search forward and then backward to find the start of number. | |
| 5799 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 col = pos->col; |
| 6868 | 5801 |
| 5802 while (ptr[col] != NUL | |
| 5803 && !vim_isdigit(ptr[col]) | |
| 5804 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5805 col += MB_PTR2LEN(ptr + col); |
| 6868 | 5806 |
| 5807 while (col > 0 | |
| 5808 && vim_isdigit(ptr[col - 1]) | |
| 5809 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5810 { |
| 6868 | 5811 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5812 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5813 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5814 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
|
5815 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5816 } |
| 6868 | 5817 } |
| 5818 } | |
| 5819 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 if (visual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 while (ptr[col] != NUL && length > 0 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 && !vim_isdigit(ptr[col]) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5826 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
|
5827 |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5828 col += mb_len; |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5829 length -= mb_len; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 if (length == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5835 if (col > pos->col && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5836 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5837 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5838 !(*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
|
5839 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5840 ) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 was_positive = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 * 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
|
5849 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 firstdigit = ptr[col]; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 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
|
5852 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 beep_flush(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5857 if (doalp && ASCII_ISALPHA(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5858 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 /* decrement or increment alphabetic character */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 if (CharOrd(firstdigit) < Prenum1) |
| 6927 | 5863 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 firstdigit = 'A'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 firstdigit = 'a'; |
| 6927 | 5868 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 firstdigit -= Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
| 6927 | 5879 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 firstdigit = 'Z'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 firstdigit = 'z'; |
| 6927 | 5884 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 firstdigit += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 #endif |
|
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 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 (void)del_char(FALSE); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 ins_char(firstdigit); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5903 if (col > 0 && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5904 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5905 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5906 !(*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
|
5907 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5908 && !visual) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 /* negative number */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 --col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5912 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 /* get the number value (unsigned) */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5915 if (visual && VIsual_mode != 'V') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5916 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
|
5917 ? (int)STRLEN(ptr) - col |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 : length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5919 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 vim_str2nr(ptr + col, &pre, &length, |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 0 + (dobin ? STR2NR_BIN : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 + (dooct ? STR2NR_OCT : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5923 + (dohex ? STR2NR_HEX : 0), |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 NULL, &n, maxlen); |
|
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 /* 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
|
5927 if (pre && negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 ++col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 negative = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 /* add or subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 subtract = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5937 if (negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 oldn = n; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 if (subtract) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5942 n -= (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5944 n += (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 /* handle wraparound for decimal numbers */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 if (!pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5947 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5948 if (subtract) |
| 6927 | 5949 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5950 if (n > oldn) |
| 6868 | 5951 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5952 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
|
5953 negative ^= TRUE; |
| 6868 | 5954 } |
| 7 | 5955 } |
| 5956 else | |
| 6868 | 5957 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5958 /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5959 if (n < oldn) |
| 6868 | 5960 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5961 n = (n ^ (uvarnumber_T)-1); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5962 negative ^= TRUE; |
| 6868 | 5963 } |
| 6927 | 5964 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5965 if (n == 0) |
| 6868 | 5966 negative = FALSE; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5967 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5968 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5969 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
|
5970 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5971 /* need to remove the '-' */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5972 col--; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5973 length++; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5974 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5975 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5976 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5977 * Delete the old number. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5978 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5979 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5980 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5981 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5982 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5983 todel = length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5984 c = gchar_cursor(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5985 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5986 * 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
|
5987 * 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
|
5988 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5989 if (c == '-') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5990 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5991 while (todel-- > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5992 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5993 if (c < 0x100 && isalpha(c)) |
| 6868 | 5994 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5995 if (isupper(c)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5996 hexupper = TRUE; |
| 6868 | 5997 else |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5998 hexupper = FALSE; |
| 6891 | 5999 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6000 /* 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
|
6001 (void)del_char(FALSE); |
| 6868 | 6002 c = gchar_cursor(); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6003 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6004 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6005 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6006 * Prepare the leading characters in buf1[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6007 * 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
|
6008 * Allocate a bit too much. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6009 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6010 buf1 = alloc((unsigned)length + NUMBUFLEN); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6011 if (buf1 == NULL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6012 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6013 ptr = buf1; |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
6014 if (negative && (!visual || was_positive)) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6015 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6016 *ptr++ = '-'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6017 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6018 if (pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6019 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6020 *ptr++ = '0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6021 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6022 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6023 if (pre == 'b' || pre == 'B' || |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6024 pre == 'x' || pre == 'X') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6025 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6026 *ptr++ = pre; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6027 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6028 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6029 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6030 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6031 * Put the number characters in buf2[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6032 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6033 if (pre == 'b' || pre == 'B') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6034 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6035 int i; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6036 int bit = 0; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6037 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
|
6038 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6039 /* leading zeros */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6040 for (bit = bits; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6041 if ((n >> (bit - 1)) & 0x1) break; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6042 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6043 for (i = 0; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6044 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
|
6045 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6046 buf2[i] = '\0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6047 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6048 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
|
6049 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6050 (long long unsigned)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6051 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
|
6052 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6053 (long long unsigned)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6054 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
|
6055 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6056 (long long unsigned)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6057 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
|
6058 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6059 (long long unsigned)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6060 length -= (int)STRLEN(buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6061 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6062 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6063 * 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
|
6064 * 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
|
6065 * Don't do this when |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6066 * 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
|
6067 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6068 if (firstdigit == '0' && !(dooct && pre == 0)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6069 while (length-- > 0) |
| 6868 | 6070 *ptr++ = '0'; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6071 *ptr = NUL; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6072 STRCAT(buf1, buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6073 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
|
6074 vim_free(buf1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6075 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6076 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
|
6077 --curwin->w_cursor.col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6078 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6079 |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6080 if (did_change) |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6081 { |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6082 /* set the '[ and '] marks */ |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6083 curbuf->b_op_start = startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6084 curbuf->b_op_end = endpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6085 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
|
6086 --curbuf->b_op_end.col; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6087 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6088 |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6089 theend: |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6090 if (visual) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6091 curwin->w_cursor = save_cursor; |
|
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6092 else if (did_change) |
|
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6093 curwin->w_set_curswant = TRUE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6094 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6095 return did_change; |
| 7 | 6096 } |
| 6097 | |
| 6098 #ifdef FEAT_VIMINFO | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 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
|
6101 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 #define REG_PREVIOUS 1 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6103 #define REG_EXEC 2 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6104 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6105 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6106 * 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
|
6107 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6108 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6109 prepare_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 y_read_regs = (yankreg_T *)alloc_clear(NUM_REGISTERS |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 * (int)sizeof(yankreg_T)); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6116 finish_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6117 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6118 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 int j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6121 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6122 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6123 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
|
6124 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
|
6125 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6126 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
|
6127 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
|
6128 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
|
6129 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6130 VIM_CLEAR(y_read_regs); |
|
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 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 |
| 7 | 6134 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6135 read_viminfo_register(vir_T *virp, int force) |
| 7 | 6136 { |
| 6137 int eof; | |
| 6138 int do_it = TRUE; | |
| 6139 int size; | |
| 6140 int limit; | |
| 6141 int i; | |
| 6142 int set_prev = FALSE; | |
| 6143 char_u *str; | |
| 6144 char_u **array = NULL; | |
| 6508 | 6145 int new_type = MCHAR; /* init to shut up compiler */ |
| 6146 colnr_T new_width = 0; /* init to shut up compiler */ | |
| 7 | 6147 |
| 6148 /* We only get here (hopefully) if line[0] == '"' */ | |
| 6149 str = virp->vir_line + 1; | |
| 1893 | 6150 |
| 6151 /* If the line starts with "" this is the y_previous register. */ | |
| 7 | 6152 if (*str == '"') |
| 6153 { | |
| 6154 set_prev = TRUE; | |
| 6155 str++; | |
| 6156 } | |
| 1893 | 6157 |
| 7 | 6158 if (!ASCII_ISALNUM(*str) && *str != '-') |
| 6159 { | |
| 6160 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
| 6161 return TRUE; /* too many errors, pretend end-of-file */ | |
| 6162 do_it = FALSE; | |
| 6163 } | |
| 6164 get_yank_register(*str++, FALSE); | |
| 6165 if (!force && y_current->y_array != NULL) | |
| 6166 do_it = FALSE; | |
| 1893 | 6167 |
| 6168 if (*str == '@') | |
| 6169 { | |
| 6170 /* "x@: register x used for @@ */ | |
| 6171 if (force || execreg_lastc == NUL) | |
| 6172 execreg_lastc = str[-1]; | |
| 6173 } | |
| 6174 | |
| 7 | 6175 size = 0; |
| 6176 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
| 6177 if (do_it) | |
| 6178 { | |
| 6462 | 6179 /* |
| 6180 * Build the new register in array[]. | |
| 6181 * y_array is kept as-is until done. | |
| 6182 * The "do_it" flag is reset when something is wrong, in which case | |
| 6183 * array[] needs to be freed. | |
| 6184 */ | |
| 7 | 6185 if (set_prev) |
| 6186 y_previous = y_current; | |
| 6462 | 6187 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
| 1893 | 6188 str = skipwhite(skiptowhite(str)); |
| 7 | 6189 if (STRNCMP(str, "CHAR", 4) == 0) |
| 6462 | 6190 new_type = MCHAR; |
| 7 | 6191 else if (STRNCMP(str, "BLOCK", 5) == 0) |
| 6462 | 6192 new_type = MBLOCK; |
| 7 | 6193 else |
| 6462 | 6194 new_type = MLINE; |
| 7 | 6195 /* get the block width; if it's missing we get a zero, which is OK */ |
| 6196 str = skipwhite(skiptowhite(str)); | |
| 6462 | 6197 new_width = getdigits(&str); |
| 7 | 6198 } |
| 6199 | |
| 6200 while (!(eof = viminfo_readline(virp)) | |
| 6201 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
| 6202 { | |
| 6203 if (do_it) | |
| 6204 { | |
| 6462 | 6205 if (size == limit) |
| 7 | 6206 { |
| 6462 | 6207 char_u **new_array = (char_u **) |
| 7 | 6208 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
| 6462 | 6209 |
| 6210 if (new_array == NULL) | |
| 6211 { | |
| 6212 do_it = FALSE; | |
| 6213 break; | |
| 6214 } | |
| 7 | 6215 for (i = 0; i < limit; i++) |
| 6462 | 6216 new_array[i] = array[i]; |
| 7 | 6217 vim_free(array); |
| 6462 | 6218 array = new_array; |
| 7 | 6219 limit *= 2; |
| 6220 } | |
| 6221 str = viminfo_readstring(virp, 1, TRUE); | |
| 6222 if (str != NULL) | |
| 6223 array[size++] = str; | |
| 6224 else | |
| 6462 | 6225 /* error, don't store the result */ |
| 7 | 6226 do_it = FALSE; |
| 6227 } | |
| 6228 } | |
| 6508 | 6229 |
| 7 | 6230 if (do_it) |
| 6231 { | |
| 6462 | 6232 /* free y_array[] */ |
| 6233 for (i = 0; i < y_current->y_size; i++) | |
| 6234 vim_free(y_current->y_array[i]); | |
| 6235 vim_free(y_current->y_array); | |
| 6236 | |
| 6237 y_current->y_type = new_type; | |
| 6238 y_current->y_width = new_width; | |
| 6239 y_current->y_size = size; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6240 y_current->y_time_set = 0; |
| 7 | 6241 if (size == 0) |
| 6242 { | |
| 6243 y_current->y_array = NULL; | |
| 6244 } | |
| 6462 | 6245 else |
| 7 | 6246 { |
| 6462 | 6247 /* Move the lines from array[] to y_array[]. */ |
| 7 | 6248 y_current->y_array = |
| 6249 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
| 6250 for (i = 0; i < size; i++) | |
| 6462 | 6251 { |
| 6252 if (y_current->y_array == NULL) | |
| 6253 vim_free(array[i]); | |
| 6254 else | |
| 6255 y_current->y_array[i] = array[i]; | |
| 6256 } | |
| 7 | 6257 } |
| 6462 | 6258 } |
| 6259 else | |
| 6260 { | |
| 6261 /* Free array[] if it was filled. */ | |
| 6262 for (i = 0; i < size; i++) | |
| 6263 vim_free(array[i]); | |
| 6264 } | |
| 6265 vim_free(array); | |
| 6266 | |
| 7 | 6267 return eof; |
| 6268 } | |
| 6269 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 * 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
|
6272 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6273 void |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 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
|
6275 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 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
|
6277 int flags; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6279 int type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6280 int linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 int width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 time_t timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 yankreg_T *y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 /* Check the format: |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6288 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 if (values->ga_len < 6 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 || vp[0].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6292 || vp[1].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6293 || vp[2].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6294 || vp[3].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6295 || vp[4].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 || vp[5].bv_type != BVAL_NR) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6297 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6298 flags = vp[0].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6299 name = vp[1].bv_nr; |
|
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6300 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
|
6301 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6302 type = vp[2].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 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
|
6304 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6305 linecount = vp[3].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6306 if (values->ga_len < 6 + linecount) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6307 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6308 width = vp[4].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6309 if (width < 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6310 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6311 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6312 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6313 /* 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
|
6314 * 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
|
6315 y_ptr = &y_read_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6316 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6317 y_ptr = &y_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6318 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6319 /* 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
|
6320 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
|
6321 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
|
6322 && (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
|
6323 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6324 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6325 if (y_ptr->y_array != NULL) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6326 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
|
6327 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
|
6328 vim_free(y_ptr->y_array); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6329 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6330 if (y_read_regs == NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6331 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6332 if (flags & REG_PREVIOUS) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6333 y_previous = y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6334 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
|
6335 execreg_lastc = get_register_name(name); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6336 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6337 y_ptr->y_type = type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6338 y_ptr->y_width = width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6339 y_ptr->y_size = linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6340 y_ptr->y_time_set = timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6341 if (linecount == 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6342 y_ptr->y_array = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6343 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6344 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6345 y_ptr->y_array = |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6346 (char_u **)alloc((unsigned)(linecount * sizeof(char_u *))); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6347 for (i = 0; i < linecount; i++) |
|
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 if (vp[i + 6].bv_allocated) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6350 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6351 y_ptr->y_array[i] = vp[i + 6].bv_string; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6352 vp[i + 6].bv_string = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6353 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6354 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6355 y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6356 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6357 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6358 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6359 |
| 7 | 6360 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6361 write_viminfo_registers(FILE *fp) |
| 7 | 6362 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6363 int i, j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6364 char_u *type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6365 char_u c; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6366 int num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6367 int max_num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6368 int max_kbyte; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6369 long len; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6370 yankreg_T *y_ptr; |
| 7 | 6371 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6372 fputs(_("\n# Registers:\n"), fp); |
| 7 | 6373 |
| 6374 /* Get '<' value, use old '"' value if '<' is not found. */ | |
| 6375 max_num_lines = get_viminfo_parameter('<'); | |
| 6376 if (max_num_lines < 0) | |
| 6377 max_num_lines = get_viminfo_parameter('"'); | |
| 6378 if (max_num_lines == 0) | |
| 6379 return; | |
| 6380 max_kbyte = get_viminfo_parameter('s'); | |
| 6381 if (max_kbyte == 0) | |
| 6382 return; | |
| 1893 | 6383 |
| 7 | 6384 for (i = 0; i < NUM_REGISTERS; i++) |
| 6385 { | |
| 6386 #ifdef FEAT_CLIPBOARD | |
| 6387 /* Skip '*'/'+' register, we don't want them back next time */ | |
| 6388 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
| 6389 continue; | |
| 6390 #endif | |
| 6391 #ifdef FEAT_DND | |
| 6392 /* Neither do we want the '~' register */ | |
| 6393 if (i == TILDE_REGISTER) | |
| 6394 continue; | |
| 6395 #endif | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6396 /* 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
|
6397 * viminfo if it's newer. */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6398 if (y_read_regs != NULL |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6399 && 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
|
6400 && (y_regs[i].y_array == NULL || |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6401 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
|
6402 y_ptr = &y_read_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6403 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
|
6404 continue; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6405 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6406 y_ptr = &y_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6407 |
| 55 | 6408 /* Skip empty registers. */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6409 num_lines = y_ptr->y_size; |
| 55 | 6410 if (num_lines == 0 |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6411 || (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
|
6412 && *y_ptr->y_array[0] == NUL)) |
| 55 | 6413 continue; |
| 6414 | |
| 7 | 6415 if (max_kbyte > 0) |
| 6416 { | |
| 6417 /* Skip register if there is more text than the maximum size. */ | |
| 6418 len = 0; | |
| 6419 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
|
6420 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
| 7 | 6421 if (len > (long)max_kbyte * 1024L) |
| 6422 continue; | |
| 6423 } | |
| 6424 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6425 switch (y_ptr->y_type) |
| 7 | 6426 { |
| 6427 case MLINE: | |
| 6428 type = (char_u *)"LINE"; | |
| 6429 break; | |
| 6430 case MCHAR: | |
| 6431 type = (char_u *)"CHAR"; | |
| 6432 break; | |
| 6433 case MBLOCK: | |
| 6434 type = (char_u *)"BLOCK"; | |
| 6435 break; | |
| 6436 default: | |
| 6437 sprintf((char *)IObuff, _("E574: Unknown register type %d"), | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6438 y_ptr->y_type); |
| 7 | 6439 emsg(IObuff); |
| 6440 type = (char_u *)"LINE"; | |
| 6441 break; | |
| 6442 } | |
| 6443 if (y_previous == &y_regs[i]) | |
| 6444 fprintf(fp, "\""); | |
| 6445 c = get_register_name(i); | |
| 1893 | 6446 fprintf(fp, "\"%c", c); |
| 6447 if (c == execreg_lastc) | |
| 6448 fprintf(fp, "@"); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6449 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
| 7 | 6450 |
| 6451 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
| 6452 if (max_num_lines > 0 && num_lines > max_num_lines) | |
| 6453 num_lines = max_num_lines; | |
| 6454 for (j = 0; j < num_lines; j++) | |
| 6455 { | |
| 6456 putc('\t', fp); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6457 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
|
6458 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6459 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6460 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6461 int flags = 0; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6462 int remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6463 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6464 /* 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
|
6465 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6466 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6467 * 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
|
6468 * REG_EXEC - used for @@ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6469 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6470 if (y_previous == &y_regs[i]) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6471 flags |= REG_PREVIOUS; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6472 if (c == execreg_lastc) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6473 flags |= REG_EXEC; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6474 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
|
6475 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
|
6476 (long)y_ptr->y_time_set); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6477 /* 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
|
6478 remaining = LSIZE - 71; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6479 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
|
6480 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6481 putc(',', fp); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6482 --remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6483 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
|
6484 remaining); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6485 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6486 putc('\n', fp); |
| 7 | 6487 } |
| 6488 } | |
| 6489 } | |
| 6490 #endif /* FEAT_VIMINFO */ | |
| 6491 | |
| 6492 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 6493 /* | |
| 6494 * SELECTION / PRIMARY ('*') | |
| 6495 * | |
| 6496 * Text selection stuff that uses the GUI selection register '*'. When using a | |
| 6497 * GUI this may be text from another window, otherwise it is the last text we | |
| 6498 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
| 6499 * button performs the paste, otherwise you will need to do <"*p>. " | |
| 6500 * If not under X, it is synonymous with the clipboard register '+'. | |
| 6501 * | |
| 6502 * X CLIPBOARD ('+') | |
| 6503 * | |
| 6504 * Text selection stuff that uses the GUI clipboard register '+'. | |
| 6505 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
| 6506 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
| 6507 * otherwise you will need to do <"+p>. " | |
| 6508 * If not under X, it is synonymous with the selection register '*'. | |
| 6509 */ | |
| 6510 | |
| 6511 /* | |
| 6512 * 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
|
6513 * so that the text is still available after Vim has exited. X selections |
| 7 | 6514 * only exist while the owning application exists, so we write to the |
| 6515 * permanent (while X runs) store CUT_BUFFER0. | |
| 6516 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
| 6517 * 'permanent' of the two), otherwise the PRIMARY one. | |
| 6518 * For now, use a hard-coded sanity limit of 1Mb of data. | |
| 6519 */ | |
|
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6520 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
| 7 | 6521 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6522 x11_export_final_selection(void) |
| 7 | 6523 { |
| 6524 Display *dpy; | |
| 6525 char_u *str = NULL; | |
| 6526 long_u len = 0; | |
| 6527 int motion_type = -1; | |
| 6528 | |
| 6529 # ifdef FEAT_GUI | |
| 6530 if (gui.in_use) | |
| 6531 dpy = X_DISPLAY; | |
| 6532 else | |
| 6533 # endif | |
| 6534 # ifdef FEAT_XCLIPBOARD | |
| 6535 dpy = xterm_dpy; | |
| 6536 # else | |
| 6537 return; | |
| 6538 # endif | |
| 6539 | |
| 6540 /* Get selection to export */ | |
| 6541 if (clip_plus.owned) | |
| 6542 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
| 6543 else if (clip_star.owned) | |
| 6544 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
| 6545 | |
| 6546 /* Check it's OK */ | |
| 6547 if (dpy != NULL && str != NULL && motion_type >= 0 | |
| 6548 && len < 1024*1024 && len > 0) | |
| 6549 { | |
| 1924 | 6550 #ifdef FEAT_MBYTE |
| 4201 | 6551 int ok = TRUE; |
| 6552 | |
| 1924 | 6553 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
| 6554 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
| 6555 * encoding conversion usually doesn't work, so keep the text as-is. | |
| 6556 */ | |
| 6557 if (has_mbyte) | |
| 6558 { | |
| 6559 vimconv_T vc; | |
| 6560 | |
| 6561 vc.vc_type = CONV_NONE; | |
| 6562 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
| 6563 { | |
|
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6564 int intlen = len; |
|
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6565 char_u *conv_str; |
| 2007 | 6566 |
| 4201 | 6567 vc.vc_fail = TRUE; |
| 2007 | 6568 conv_str = string_convert(&vc, str, &intlen); |
| 6569 len = intlen; | |
| 1924 | 6570 if (conv_str != NULL) |
| 6571 { | |
| 6572 vim_free(str); | |
| 6573 str = conv_str; | |
| 6574 } | |
| 4201 | 6575 else |
| 6576 { | |
| 6577 ok = FALSE; | |
| 6578 } | |
| 1924 | 6579 convert_setup(&vc, NULL, NULL); |
| 6580 } | |
| 4201 | 6581 else |
| 6582 { | |
| 6583 ok = FALSE; | |
| 6584 } | |
| 1924 | 6585 } |
| 4201 | 6586 |
| 6587 /* Do not store the string if conversion failed. Better to use any | |
| 6588 * other selection than garbled text. */ | |
| 6589 if (ok) | |
| 6590 #endif | |
| 6591 { | |
| 6592 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
| 6593 XFlush(dpy); | |
| 6594 } | |
| 7 | 6595 } |
| 6596 | |
| 6597 vim_free(str); | |
| 6598 } | |
| 6599 #endif | |
| 6600 | |
| 6601 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6602 clip_free_selection(VimClipboard *cbd) |
| 7 | 6603 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6604 yankreg_T *y_ptr = y_current; |
| 7 | 6605 |
| 6606 if (cbd == &clip_plus) | |
| 6607 y_current = &y_regs[PLUS_REGISTER]; | |
| 6608 else | |
| 6609 y_current = &y_regs[STAR_REGISTER]; | |
| 6610 free_yank_all(); | |
| 6611 y_current->y_size = 0; | |
| 6612 y_current = y_ptr; | |
| 6613 } | |
| 6614 | |
| 6615 /* | |
| 6616 * Get the selected text and put it in the gui selection register '*' or '+'. | |
| 6617 */ | |
| 6618 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6619 clip_get_selection(VimClipboard *cbd) |
| 7 | 6620 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6621 yankreg_T *old_y_previous, *old_y_current; |
| 7 | 6622 pos_T old_cursor; |
| 6623 pos_T old_visual; | |
| 6624 int old_visual_mode; | |
| 6625 colnr_T old_curswant; | |
| 6626 int old_set_curswant; | |
| 6627 pos_T old_op_start, old_op_end; | |
| 6628 oparg_T oa; | |
| 6629 cmdarg_T ca; | |
| 6630 | |
| 6631 if (cbd->owned) | |
| 6632 { | |
| 6633 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
| 6634 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
| 6635 return; | |
| 6636 | |
| 6637 /* Get the text between clip_star.start & clip_star.end */ | |
| 6638 old_y_previous = y_previous; | |
| 6639 old_y_current = y_current; | |
| 6640 old_cursor = curwin->w_cursor; | |
| 6641 old_curswant = curwin->w_curswant; | |
| 6642 old_set_curswant = curwin->w_set_curswant; | |
| 6643 old_op_start = curbuf->b_op_start; | |
| 6644 old_op_end = curbuf->b_op_end; | |
| 6645 old_visual = VIsual; | |
| 6646 old_visual_mode = VIsual_mode; | |
| 6647 clear_oparg(&oa); | |
| 6648 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
| 6649 oa.op_type = OP_YANK; | |
| 6650 vim_memset(&ca, 0, sizeof(ca)); | |
| 6651 ca.oap = &oa; | |
| 6652 ca.cmdchar = 'y'; | |
| 6653 ca.count1 = 1; | |
| 6654 ca.retval = CA_NO_ADJ_OP_END; | |
| 6655 do_pending_operator(&ca, 0, TRUE); | |
| 6656 y_previous = old_y_previous; | |
| 6657 y_current = old_y_current; | |
| 6658 curwin->w_cursor = old_cursor; | |
| 688 | 6659 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
| 7 | 6660 curwin->w_curswant = old_curswant; |
| 6661 curwin->w_set_curswant = old_set_curswant; | |
| 6662 curbuf->b_op_start = old_op_start; | |
| 6663 curbuf->b_op_end = old_op_end; | |
| 6664 VIsual = old_visual; | |
| 6665 VIsual_mode = old_visual_mode; | |
| 6666 } | |
|
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6667 else if (!is_clipboard_needs_update()) |
| 7 | 6668 { |
| 6669 clip_free_selection(cbd); | |
| 6670 | |
| 6671 /* Try to get selected text from another window */ | |
| 6672 clip_gen_request_selection(cbd); | |
| 6673 } | |
| 6674 } | |
| 6675 | |
| 2896 | 6676 /* |
| 6677 * Convert from the GUI selection string into the '*'/'+' register. | |
| 6678 */ | |
| 7 | 6679 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6680 clip_yank_selection( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6681 int type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6682 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6683 long len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6684 VimClipboard *cbd) |
| 7 | 6685 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6686 yankreg_T *y_ptr; |
| 7 | 6687 |
| 6688 if (cbd == &clip_plus) | |
| 6689 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6690 else | |
| 6691 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6692 | |
| 6693 clip_free_selection(cbd); | |
| 6694 | |
| 5798 | 6695 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
| 7 | 6696 } |
| 6697 | |
| 6698 /* | |
| 6699 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
| 6700 * with length *len. | |
| 6701 * Returns the motion type, or -1 for failure. | |
| 6702 */ | |
| 6703 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6704 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
| 7 | 6705 { |
| 6706 char_u *p; | |
| 6707 int lnum; | |
| 6708 int i, j; | |
| 6709 int_u eolsize; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6710 yankreg_T *y_ptr; |
| 7 | 6711 |
| 6712 if (cbd == &clip_plus) | |
| 6713 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6714 else | |
| 6715 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6716 | |
| 6717 #ifdef USE_CRNL | |
| 6718 eolsize = 2; | |
| 6719 #else | |
| 6720 eolsize = 1; | |
| 6721 #endif | |
| 6722 | |
| 6723 *str = NULL; | |
| 6724 *len = 0; | |
| 6725 if (y_ptr->y_array == NULL) | |
| 6726 return -1; | |
| 6727 | |
| 6728 for (i = 0; i < y_ptr->y_size; i++) | |
| 6729 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
| 6730 | |
| 6731 /* | |
| 6732 * Don't want newline character at end of last line if we're in MCHAR mode. | |
| 6733 */ | |
| 6734 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
| 6735 *len -= eolsize; | |
| 6736 | |
| 6737 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
| 6738 if (p == NULL) | |
| 6739 return -1; | |
| 6740 lnum = 0; | |
| 6741 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
| 6742 { | |
| 6743 if (y_ptr->y_array[lnum][j] == '\n') | |
| 6744 p[i] = NUL; | |
| 6745 else if (y_ptr->y_array[lnum][j] == NUL) | |
| 6746 { | |
| 6747 #ifdef USE_CRNL | |
| 6748 p[i++] = '\r'; | |
| 6749 #endif | |
| 6750 #ifdef USE_CR | |
| 6751 p[i] = '\r'; | |
| 6752 #else | |
| 6753 p[i] = '\n'; | |
| 6754 #endif | |
| 6755 lnum++; | |
| 6756 j = -1; | |
| 6757 } | |
| 6758 else | |
| 6759 p[i] = y_ptr->y_array[lnum][j]; | |
| 6760 } | |
| 6761 return y_ptr->y_type; | |
| 6762 } | |
| 6763 | |
| 6764 | |
| 6765 /* | |
| 6766 * If we have written to a clipboard register, send the text to the clipboard. | |
| 6767 */ | |
| 6768 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6769 may_set_selection(void) |
| 7 | 6770 { |
| 6771 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
| 6772 { | |
| 6773 clip_own_selection(&clip_star); | |
| 6774 clip_gen_set_selection(&clip_star); | |
| 6775 } | |
| 6776 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
| 6777 { | |
| 6778 clip_own_selection(&clip_plus); | |
| 6779 clip_gen_set_selection(&clip_plus); | |
| 6780 } | |
| 6781 } | |
| 6782 | |
| 6783 #endif /* FEAT_CLIPBOARD || PROTO */ | |
| 6784 | |
| 6785 | |
| 6786 #if defined(FEAT_DND) || defined(PROTO) | |
| 6787 /* | |
| 6788 * Replace the contents of the '~' register with str. | |
| 6789 */ | |
| 6790 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6791 dnd_yank_drag_data(char_u *str, long len) |
| 7 | 6792 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6793 yankreg_T *curr; |
| 7 | 6794 |
| 6795 curr = y_current; | |
| 6796 y_current = &y_regs[TILDE_REGISTER]; | |
| 6797 free_yank_all(); | |
| 5798 | 6798 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
| 7 | 6799 y_current = curr; |
| 6800 } | |
| 6801 #endif | |
| 6802 | |
| 6803 | |
| 6804 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 6805 /* | |
| 6806 * Return the type of a register. | |
| 6807 * Used for getregtype() | |
| 6808 * Returns MAUTO for error. | |
| 6809 */ | |
| 6810 char_u | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6811 get_reg_type(int regname, long *reglen) |
| 7 | 6812 { |
| 6813 switch (regname) | |
| 6814 { | |
| 6815 case '%': /* file name */ | |
| 6816 case '#': /* alternate file name */ | |
| 6817 case '=': /* expression */ | |
| 6818 case ':': /* last command line */ | |
| 6819 case '/': /* last search-pattern */ | |
| 6820 case '.': /* last inserted text */ | |
| 6821 #ifdef FEAT_SEARCHPATH | |
| 6822 case Ctrl_F: /* Filename under cursor */ | |
| 6823 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 6824 #endif | |
| 6825 case Ctrl_W: /* word under cursor */ | |
| 6826 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 6827 case '_': /* black hole: always empty */ | |
| 6828 return MCHAR; | |
| 6829 } | |
| 6830 | |
| 6831 #ifdef FEAT_CLIPBOARD | |
| 6832 regname = may_get_selection(regname); | |
| 6833 #endif | |
| 6834 | |
| 5596 | 6835 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
|
6836 return MAUTO; |
| 5596 | 6837 |
| 7 | 6838 get_yank_register(regname, FALSE); |
| 6839 | |
| 6840 if (y_current->y_array != NULL) | |
| 6841 { | |
| 6842 if (reglen != NULL && y_current->y_type == MBLOCK) | |
| 6843 *reglen = y_current->y_width; | |
| 6844 return y_current->y_type; | |
| 6845 } | |
| 6846 return MAUTO; | |
| 6847 } | |
| 6848 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6849 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
| 5796 | 6850 |
| 6851 /* | |
| 6852 * When "flags" has GREG_LIST return a list with text "s". | |
| 6853 * Otherwise just return "s". | |
| 6854 */ | |
| 6855 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6856 getreg_wrap_one_line(char_u *s, int flags) |
| 5796 | 6857 { |
| 6858 if (flags & GREG_LIST) | |
| 6859 { | |
| 6860 list_T *list = list_alloc(); | |
| 6861 | |
| 6862 if (list != NULL) | |
| 6863 { | |
| 6864 if (list_append_string(list, NULL, -1) == FAIL) | |
| 6865 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6866 list_free(list); |
| 5796 | 6867 return NULL; |
| 6868 } | |
| 6869 list->lv_first->li_tv.vval.v_string = s; | |
| 6870 } | |
| 6871 return (char_u *)list; | |
| 6872 } | |
| 6873 return s; | |
| 6874 } | |
| 6875 | |
| 7 | 6876 /* |
| 6877 * Return the contents of a register as a single allocated string. | |
| 6878 * Used for "@r" in expressions and for getreg(). | |
| 6879 * Returns NULL for error. | |
| 5796 | 6880 * Flags: |
| 6881 * GREG_NO_EXPR Do not allow expression register | |
| 6882 * GREG_EXPR_SRC For the expression register: return expression itself, | |
| 6883 * not the result of its evaluation. | |
| 6884 * GREG_LIST Return a list of lines in place of a single string. | |
| 7 | 6885 */ |
| 6886 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6887 get_reg_contents(int regname, int flags) |
| 7 | 6888 { |
| 6889 long i; | |
| 6890 char_u *retval; | |
| 6891 int allocated; | |
| 6892 long len; | |
| 6893 | |
| 6894 /* Don't allow using an expression register inside an expression */ | |
| 6895 if (regname == '=') | |
| 6896 { | |
| 5796 | 6897 if (flags & GREG_NO_EXPR) |
| 6898 return NULL; | |
| 6899 if (flags & GREG_EXPR_SRC) | |
| 6900 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
| 6901 return getreg_wrap_one_line(get_expr_line(), flags); | |
| 7 | 6902 } |
| 6903 | |
| 6904 if (regname == '@') /* "@@" is used for unnamed register */ | |
| 6905 regname = '"'; | |
| 6906 | |
| 6907 /* check for valid regname */ | |
| 6908 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 6909 return NULL; | |
| 6910 | |
| 6911 #ifdef FEAT_CLIPBOARD | |
| 6912 regname = may_get_selection(regname); | |
| 6913 #endif | |
| 6914 | |
| 6915 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
| 6916 { | |
| 6917 if (retval == NULL) | |
| 6918 return NULL; | |
| 5796 | 6919 if (allocated) |
| 6920 return getreg_wrap_one_line(retval, flags); | |
| 6921 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
| 7 | 6922 } |
| 6923 | |
| 6924 get_yank_register(regname, FALSE); | |
| 6925 if (y_current->y_array == NULL) | |
| 6926 return NULL; | |
| 6927 | |
| 5796 | 6928 if (flags & GREG_LIST) |
| 6929 { | |
| 6930 list_T *list = list_alloc(); | |
| 6931 int error = FALSE; | |
| 6932 | |
| 6933 if (list == NULL) | |
| 6934 return NULL; | |
| 6935 for (i = 0; i < y_current->y_size; ++i) | |
| 6936 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
| 6937 error = TRUE; | |
| 6938 if (error) | |
| 6939 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6940 list_free(list); |
| 5796 | 6941 return NULL; |
| 6942 } | |
| 6943 return (char_u *)list; | |
| 6944 } | |
| 6945 | |
| 7 | 6946 /* |
| 6947 * Compute length of resulting string. | |
| 6948 */ | |
| 6949 len = 0; | |
| 6950 for (i = 0; i < y_current->y_size; ++i) | |
| 6951 { | |
| 6952 len += (long)STRLEN(y_current->y_array[i]); | |
| 6953 /* | |
| 6954 * Insert a newline between lines and after last line if | |
| 6955 * y_type is MLINE. | |
| 6956 */ | |
| 6957 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6958 ++len; | |
| 6959 } | |
| 6960 | |
| 6961 retval = lalloc(len + 1, TRUE); | |
| 6962 | |
| 6963 /* | |
| 6964 * Copy the lines of the yank register into the string. | |
| 6965 */ | |
| 6966 if (retval != NULL) | |
| 6967 { | |
| 6968 len = 0; | |
| 6969 for (i = 0; i < y_current->y_size; ++i) | |
| 6970 { | |
| 6971 STRCPY(retval + len, y_current->y_array[i]); | |
| 6972 len += (long)STRLEN(retval + len); | |
| 6973 | |
| 6974 /* | |
| 6975 * Insert a NL between lines and after the last line if y_type is | |
| 6976 * MLINE. | |
| 6977 */ | |
| 6978 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6979 retval[len++] = '\n'; | |
| 6980 } | |
| 6981 retval[len] = NUL; | |
| 6982 } | |
| 6983 | |
| 6984 return retval; | |
| 6985 } | |
| 6986 | |
| 5798 | 6987 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6988 init_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6989 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6990 yankreg_T **old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6991 yankreg_T **old_y_current, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6992 int must_append, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6993 int *yank_type UNUSED) |
| 5798 | 6994 { |
| 6995 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
| 6996 { | |
| 6997 emsg_invreg(name); | |
| 6998 return FAIL; | |
| 6999 } | |
| 7000 | |
| 7001 /* Don't want to change the current (unnamed) register */ | |
| 7002 *old_y_previous = y_previous; | |
| 7003 *old_y_current = y_current; | |
| 7004 | |
| 7005 get_yank_register(name, TRUE); | |
| 7006 if (!y_append && !must_append) | |
| 7007 free_yank_all(); | |
| 7008 return OK; | |
| 7009 } | |
| 7010 | |
| 7011 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7012 finish_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7013 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7014 yankreg_T *old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7015 yankreg_T *old_y_current) |
| 5798 | 7016 { |
| 7017 # ifdef FEAT_CLIPBOARD | |
| 7018 /* Send text of clipboard register to the clipboard. */ | |
| 7019 may_set_selection(); | |
| 7020 # endif | |
| 7021 | |
| 7022 /* ':let @" = "val"' should change the meaning of the "" register */ | |
| 7023 if (name != '"') | |
| 7024 y_previous = old_y_previous; | |
| 7025 y_current = old_y_current; | |
| 7026 } | |
| 7027 | |
| 7 | 7028 /* |
| 7029 * Store string "str" in register "name". | |
| 7030 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
| 7031 * If "must_append" is TRUE, always append to the register. Otherwise append | |
| 7032 * if "name" is an uppercase letter. | |
| 7033 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
| 7034 * Careful: 'str' is modified, you may have to use a copy! | |
| 7035 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
| 7036 */ | |
| 7037 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7038 write_reg_contents( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7039 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7040 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7041 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7042 int must_append) |
| 7 | 7043 { |
| 7044 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
| 7045 } | |
| 7046 | |
| 7047 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7048 write_reg_contents_lst( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7049 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7050 char_u **strings, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7051 int maxlen UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7052 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7053 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7054 long block_len) |
| 5798 | 7055 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7056 yankreg_T *old_y_previous, *old_y_current; |
| 5798 | 7057 |
| 7058 if (name == '/' | |
| 7059 #ifdef FEAT_EVAL | |
| 7060 || name == '=' | |
| 7061 #endif | |
| 7062 ) | |
| 7063 { | |
| 7064 char_u *s; | |
| 7065 | |
| 7066 if (strings[0] == NULL) | |
| 7067 s = (char_u *)""; | |
| 7068 else if (strings[1] != NULL) | |
| 7069 { | |
| 7070 EMSG(_("E883: search pattern and expression register may not " | |
| 7071 "contain two or more lines")); | |
| 7072 return; | |
| 7073 } | |
| 7074 else | |
| 7075 s = strings[0]; | |
| 7076 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
| 7077 return; | |
| 7078 } | |
| 7079 | |
| 7080 if (name == '_') /* black hole: nothing to do */ | |
| 7081 return; | |
| 7082 | |
| 7083 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
| 7084 &yank_type) == FAIL) | |
| 7085 return; | |
| 7086 | |
| 7087 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
| 7088 | |
| 7089 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7090 } | |
| 7091 | |
| 7092 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7093 write_reg_contents_ex( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7094 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7095 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7096 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7097 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7098 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7099 long block_len) |
| 7 | 7100 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7101 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
|
7102 long len; |
| 7 | 7103 |
| 336 | 7104 if (maxlen >= 0) |
| 7105 len = maxlen; | |
| 7106 else | |
| 7107 len = (long)STRLEN(str); | |
| 7108 | |
| 7 | 7109 /* Special case: '/' search pattern */ |
| 7110 if (name == '/') | |
| 7111 { | |
| 7112 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
| 7113 return; | |
| 7114 } | |
| 7115 | |
| 6557 | 7116 if (name == '#') |
| 7117 { | |
| 7118 buf_T *buf; | |
| 7119 | |
| 7120 if (VIM_ISDIGIT(*str)) | |
| 7121 { | |
| 7122 int num = atoi((char *)str); | |
| 7123 | |
| 7124 buf = buflist_findnr(num); | |
| 7125 if (buf == NULL) | |
| 7126 EMSGN(_(e_nobufnr), (long)num); | |
| 7127 } | |
| 7128 else | |
| 7129 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
| 7130 TRUE, FALSE, FALSE)); | |
| 7131 if (buf == NULL) | |
| 7132 return; | |
| 7133 curwin->w_alt_fnum = buf->b_fnum; | |
| 7134 return; | |
| 7135 } | |
| 7136 | |
| 336 | 7137 #ifdef FEAT_EVAL |
| 7138 if (name == '=') | |
| 7139 { | |
| 7140 char_u *p, *s; | |
| 7141 | |
| 7142 p = vim_strnsave(str, (int)len); | |
| 7143 if (p == NULL) | |
| 7144 return; | |
| 7145 if (must_append) | |
| 7146 { | |
| 7147 s = concat_str(get_expr_line_src(), p); | |
| 7148 vim_free(p); | |
| 7149 p = s; | |
| 7150 } | |
| 7151 set_expr_line(p); | |
| 7152 return; | |
| 7153 } | |
| 7154 #endif | |
| 7155 | |
| 7 | 7156 if (name == '_') /* black hole: nothing to do */ |
| 7157 return; | |
| 7158 | |
| 5798 | 7159 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
| 7160 &yank_type) == FAIL) | |
| 7161 return; | |
| 7162 | |
| 7163 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
| 7164 | |
| 7165 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7 | 7166 } |
| 7167 #endif /* FEAT_EVAL */ | |
| 7168 | |
| 7169 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
| 7170 /* | |
| 7171 * Put a string into a register. When the register is not empty, the string | |
| 7172 * is appended. | |
| 7173 */ | |
| 7174 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7175 str_to_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7176 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
|
7177 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
|
7178 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
|
7179 long len, /* length of string */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7180 long blocklen, /* width of Visual block */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7181 int str_list) /* TRUE if str is char_u ** */ |
| 7 | 7182 { |
| 2896 | 7183 int type; /* MCHAR, MLINE or MBLOCK */ |
| 7 | 7184 int lnum; |
| 7185 long start; | |
| 7186 long i; | |
| 7187 int extra; | |
| 7188 int newlines; /* number of lines added */ | |
| 7189 int extraline = 0; /* extra line at the end */ | |
| 7190 int append = FALSE; /* append to last line in register */ | |
| 7191 char_u *s; | |
| 5798 | 7192 char_u **ss; |
| 7 | 7193 char_u **pp; |
| 7194 long maxlen; | |
| 7195 | |
| 2000 | 7196 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
| 7 | 7197 y_ptr->y_size = 0; |
| 7198 | |
| 2896 | 7199 if (yank_type == MAUTO) |
| 5798 | 7200 type = ((str_list || (len > 0 && (str[len - 1] == NL |
| 7201 || str[len - 1] == CAR))) | |
| 2896 | 7202 ? MLINE : MCHAR); |
| 7203 else | |
| 7204 type = yank_type; | |
| 7205 | |
| 7 | 7206 /* |
| 7207 * Count the number of lines within the string | |
| 7208 */ | |
| 7209 newlines = 0; | |
| 5798 | 7210 if (str_list) |
| 7211 { | |
| 7212 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
| 7 | 7213 ++newlines; |
| 5798 | 7214 } |
| 7215 else | |
| 7216 { | |
| 7217 for (i = 0; i < len; i++) | |
| 7218 if (str[i] == '\n') | |
| 7219 ++newlines; | |
| 7220 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
| 7221 { | |
| 7222 extraline = 1; | |
| 7223 ++newlines; /* count extra newline at the end */ | |
| 7224 } | |
| 7225 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
| 7226 { | |
| 7227 append = TRUE; | |
| 7228 --newlines; /* uncount newline when appending first line */ | |
| 7229 } | |
| 7 | 7230 } |
| 7231 | |
| 6807 | 7232 /* Without any lines make the register empty. */ |
| 7233 if (y_ptr->y_size + newlines == 0) | |
| 7234 { | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7235 VIM_CLEAR(y_ptr->y_array); |
| 6807 | 7236 return; |
| 7237 } | |
| 7238 | |
| 7 | 7239 /* |
| 7240 * Allocate an array to hold the pointers to the new register lines. | |
| 7241 * If the register was not empty, move the existing lines to the new array. | |
| 7242 */ | |
| 7243 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
| 7244 * sizeof(char_u *), TRUE); | |
| 7245 if (pp == NULL) /* out of memory */ | |
| 7246 return; | |
| 7247 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
| 7248 pp[lnum] = y_ptr->y_array[lnum]; | |
| 7249 vim_free(y_ptr->y_array); | |
| 7250 y_ptr->y_array = pp; | |
| 7251 maxlen = 0; | |
| 7252 | |
| 7253 /* | |
| 7254 * Find the end of each line and save it into the array. | |
| 7255 */ | |
| 5798 | 7256 if (str_list) |
| 7257 { | |
| 7258 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
| 7 | 7259 { |
| 5856 | 7260 i = (long)STRLEN(*ss); |
| 5798 | 7261 pp[lnum] = vim_strnsave(*ss, i); |
| 7262 if (i > maxlen) | |
| 7263 maxlen = i; | |
| 7 | 7264 } |
| 5798 | 7265 } |
| 7266 else | |
| 7267 { | |
| 7268 for (start = 0; start < len + extraline; start += i + 1) | |
| 7 | 7269 { |
| 5798 | 7270 for (i = start; i < len; ++i) /* find the end of the line */ |
| 7271 if (str[i] == '\n') | |
| 7272 break; | |
| 7273 i -= start; /* i is now length of line */ | |
| 7274 if (i > maxlen) | |
| 7275 maxlen = i; | |
| 7276 if (append) | |
| 7277 { | |
| 7278 --lnum; | |
| 7279 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
| 7280 } | |
| 7281 else | |
| 7282 extra = 0; | |
| 7283 s = alloc((unsigned)(i + extra + 1)); | |
| 7284 if (s == NULL) | |
| 7285 break; | |
| 7286 if (extra) | |
| 7287 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
| 7288 if (append) | |
| 7289 vim_free(y_ptr->y_array[lnum]); | |
| 7290 if (i) | |
| 7291 mch_memmove(s + extra, str + start, (size_t)i); | |
| 7292 extra += i; | |
| 7293 s[extra] = NUL; | |
| 7294 y_ptr->y_array[lnum++] = s; | |
| 7295 while (--extra >= 0) | |
| 7296 { | |
| 7297 if (*s == NUL) | |
| 7298 *s = '\n'; /* replace NUL with newline */ | |
| 7299 ++s; | |
| 7300 } | |
| 7301 append = FALSE; /* only first line is appended */ | |
| 7 | 7302 } |
| 7303 } | |
| 7304 y_ptr->y_type = type; | |
| 7305 y_ptr->y_size = lnum; | |
| 7306 if (type == MBLOCK) | |
| 7307 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
| 7308 else | |
| 7309 y_ptr->y_width = 0; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7310 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7311 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
|
7312 #endif |
| 7 | 7313 } |
| 7314 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
| 7315 | |
| 7316 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7317 clear_oparg(oparg_T *oap) |
| 7 | 7318 { |
| 7319 vim_memset(oap, 0, sizeof(oparg_T)); | |
| 7320 } | |
| 7321 | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7322 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
| 7 | 7323 |
| 7324 /* | |
| 161 | 7325 * Count the number of bytes, characters and "words" in a line. |
| 7 | 7326 * |
| 7327 * "Words" are counted by looking for boundaries between non-space and | |
| 7328 * space characters. (it seems to produce results that match 'wc'.) | |
| 7329 * | |
| 161 | 7330 * Return value is byte count; word count for the line is added to "*wc". |
| 7331 * Char count is added to "*cc". | |
| 7 | 7332 * |
| 7333 * The function will only examine the first "limit" characters in the | |
| 7334 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
| 7335 * case, eol_size will be added to the character count to account for | |
| 7336 * the size of the EOL character. | |
| 7337 */ | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7338 static varnumber_T |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7339 line_count_info( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7340 char_u *line, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7341 varnumber_T *wc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7342 varnumber_T *cc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7343 varnumber_T limit, |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7344 int eol_size) |
| 7 | 7345 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7346 varnumber_T i; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7347 varnumber_T words = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7348 varnumber_T chars = 0; |
| 7 | 7349 int is_word = 0; |
| 7350 | |
| 3626 | 7351 for (i = 0; i < limit && line[i] != NUL; ) |
| 7 | 7352 { |
| 7353 if (is_word) | |
| 7354 { | |
| 7355 if (vim_isspace(line[i])) | |
| 7356 { | |
| 7357 words++; | |
| 7358 is_word = 0; | |
| 7359 } | |
| 7360 } | |
| 7361 else if (!vim_isspace(line[i])) | |
| 7362 is_word = 1; | |
| 161 | 7363 ++chars; |
| 7364 #ifdef FEAT_MBYTE | |
| 474 | 7365 i += (*mb_ptr2len)(line + i); |
| 161 | 7366 #else |
| 7367 ++i; | |
| 7368 #endif | |
| 7 | 7369 } |
| 7370 | |
| 7371 if (is_word) | |
| 7372 words++; | |
| 7373 *wc += words; | |
| 7374 | |
| 7375 /* Add eol_size if the end of line was reached before hitting limit. */ | |
| 2996 | 7376 if (i < limit && line[i] == NUL) |
| 161 | 7377 { |
| 7 | 7378 i += eol_size; |
| 161 | 7379 chars += eol_size; |
| 7380 } | |
| 7381 *cc += chars; | |
| 7 | 7382 return i; |
| 7383 } | |
| 7384 | |
| 7385 /* | |
| 7386 * Give some info about the position of the cursor (for "g CTRL-G"). | |
| 7387 * In Visual mode, give some info about the selected region. (In this case, | |
| 7388 * 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
|
7389 * When "dict" is not NULL store the info there instead of showing it. |
| 7 | 7390 */ |
| 7391 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7392 cursor_pos_info(dict_T *dict) |
| 7 | 7393 { |
| 7394 char_u *p; | |
| 274 | 7395 char_u buf1[50]; |
| 7396 char_u buf2[40]; | |
| 7 | 7397 linenr_T lnum; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7398 varnumber_T byte_count = 0; |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7399 #ifdef FEAT_MBYTE |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7400 varnumber_T bom_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7401 #endif |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7402 varnumber_T byte_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7403 varnumber_T char_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7404 varnumber_T char_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7405 varnumber_T word_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7406 varnumber_T word_count_cursor = 0; |
| 7 | 7407 int eol_size; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7408 varnumber_T last_check = 100000L; |
| 7 | 7409 long line_count_selected = 0; |
| 7410 pos_T min_pos, max_pos; | |
| 7411 oparg_T oparg; | |
| 7412 struct block_def bd; | |
| 7413 | |
| 7414 /* | |
| 7415 * Compute the length of the file in characters. | |
| 7416 */ | |
| 7417 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 7418 { | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7419 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7420 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7421 MSG(_(no_lines_msg)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7422 return; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7423 } |
| 7 | 7424 } |
| 7425 else | |
| 7426 { | |
| 7427 if (get_fileformat(curbuf) == EOL_DOS) | |
| 7428 eol_size = 2; | |
| 7429 else | |
| 7430 eol_size = 1; | |
| 7431 | |
| 7432 if (VIsual_active) | |
| 7433 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7434 if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 7435 { |
| 7436 min_pos = VIsual; | |
| 7437 max_pos = curwin->w_cursor; | |
| 7438 } | |
| 7439 else | |
| 7440 { | |
| 7441 min_pos = curwin->w_cursor; | |
| 7442 max_pos = VIsual; | |
| 7443 } | |
| 7444 if (*p_sel == 'e' && max_pos.col > 0) | |
| 7445 --max_pos.col; | |
| 7446 | |
| 7447 if (VIsual_mode == Ctrl_V) | |
| 7448 { | |
| 1866 | 7449 #ifdef FEAT_LINEBREAK |
| 7450 char_u * saved_sbr = p_sbr; | |
| 7451 | |
| 7452 /* Make 'sbr' empty for a moment to get the correct size. */ | |
| 7453 p_sbr = empty_option; | |
| 7454 #endif | |
| 7 | 7455 oparg.is_VIsual = 1; |
| 7456 oparg.block_mode = TRUE; | |
| 7457 oparg.op_type = OP_NOP; | |
| 7458 getvcols(curwin, &min_pos, &max_pos, | |
| 688 | 7459 &oparg.start_vcol, &oparg.end_vcol); |
| 1866 | 7460 #ifdef FEAT_LINEBREAK |
| 7461 p_sbr = saved_sbr; | |
| 7462 #endif | |
| 688 | 7463 if (curwin->w_curswant == MAXCOL) |
| 7464 oparg.end_vcol = MAXCOL; | |
| 7 | 7465 /* Swap the start, end vcol if needed */ |
| 7466 if (oparg.end_vcol < oparg.start_vcol) | |
| 7467 { | |
| 7468 oparg.end_vcol += oparg.start_vcol; | |
| 7469 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
| 7470 oparg.end_vcol -= oparg.start_vcol; | |
| 7471 } | |
| 7472 } | |
| 7473 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
| 7474 } | |
| 7475 | |
| 7476 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
| 7477 { | |
| 7478 /* Check for a CTRL-C every 100000 characters. */ | |
| 161 | 7479 if (byte_count > last_check) |
| 7 | 7480 { |
| 7481 ui_breakcheck(); | |
| 7482 if (got_int) | |
| 7483 return; | |
| 161 | 7484 last_check = byte_count + 100000L; |
| 7 | 7485 } |
| 7486 | |
| 7487 /* Do extra processing for VIsual mode. */ | |
| 7488 if (VIsual_active | |
| 7489 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
| 7490 { | |
| 45 | 7491 char_u *s = NULL; |
| 7492 long len = 0L; | |
| 7493 | |
| 7 | 7494 switch (VIsual_mode) |
| 7495 { | |
| 7496 case Ctrl_V: | |
| 5735 | 7497 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7498 virtual_op = virtual_active(); |
| 5735 | 7499 #endif |
| 7 | 7500 block_prep(&oparg, &bd, lnum, 0); |
| 5735 | 7501 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7502 virtual_op = MAYBE; |
| 5735 | 7503 #endif |
| 45 | 7504 s = bd.textstart; |
| 7505 len = (long)bd.textlen; | |
| 7 | 7506 break; |
| 7507 case 'V': | |
| 45 | 7508 s = ml_get(lnum); |
| 7509 len = MAXCOL; | |
| 7 | 7510 break; |
| 7511 case 'v': | |
| 7512 { | |
| 7513 colnr_T start_col = (lnum == min_pos.lnum) | |
| 7514 ? min_pos.col : 0; | |
| 7515 colnr_T end_col = (lnum == max_pos.lnum) | |
| 7516 ? max_pos.col - start_col + 1 : MAXCOL; | |
| 7517 | |
| 45 | 7518 s = ml_get(lnum) + start_col; |
| 7519 len = end_col; | |
| 7 | 7520 } |
| 7521 break; | |
| 7522 } | |
| 45 | 7523 if (s != NULL) |
| 7524 { | |
| 161 | 7525 byte_count_cursor += line_count_info(s, &word_count_cursor, |
| 7526 &char_count_cursor, len, eol_size); | |
| 45 | 7527 if (lnum == curbuf->b_ml.ml_line_count |
| 7528 && !curbuf->b_p_eol | |
| 6933 | 7529 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
| 50 | 7530 && (long)STRLEN(s) < len) |
| 161 | 7531 byte_count_cursor -= eol_size; |
| 45 | 7532 } |
| 7 | 7533 } |
| 7534 else | |
| 7535 { | |
| 7536 /* In non-visual mode, check for the line the cursor is on */ | |
| 7537 if (lnum == curwin->w_cursor.lnum) | |
| 7538 { | |
| 7539 word_count_cursor += word_count; | |
| 161 | 7540 char_count_cursor += char_count; |
| 7541 byte_count_cursor = byte_count + | |
| 7542 line_count_info(ml_get(lnum), | |
| 7543 &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
|
7544 (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
|
7545 eol_size); |
| 7 | 7546 } |
| 7547 } | |
| 7548 /* Add to the running totals */ | |
| 161 | 7549 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
|
7550 &char_count, (varnumber_T)MAXCOL, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7551 eol_size); |
| 7 | 7552 } |
| 7553 | |
| 7554 /* Correction for when last line doesn't have an EOL. */ | |
| 6933 | 7555 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
| 161 | 7556 byte_count -= eol_size; |
| 7 | 7557 |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7558 if (dict == NULL) |
| 7 | 7559 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7560 if (VIsual_active) |
| 7 | 7561 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7562 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
|
7563 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7564 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
|
7565 &max_pos.col); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7566 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
|
7567 (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
|
7568 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7569 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7570 buf1[0] = NUL; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7571 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7572 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
|
7573 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7574 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7575 _("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
|
7576 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7577 (long)curbuf->b_ml.ml_line_count, |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7578 (long long)word_count_cursor, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7579 (long long)word_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7580 (long long)byte_count_cursor, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7581 (long long)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7582 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7583 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7584 _("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
|
7585 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7586 (long)curbuf->b_ml.ml_line_count, |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7587 (long long)word_count_cursor, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7588 (long long)word_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7589 (long long)char_count_cursor, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7590 (long long)char_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7591 (long long)byte_count_cursor, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7592 (long long)byte_count); |
| 7 | 7593 } |
| 7594 else | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7595 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7596 p = ml_get_curline(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7597 validate_virtcol(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7598 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
|
7599 (int)curwin->w_virtcol + 1); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7600 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
|
7601 linetabsize(p)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7602 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7603 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
|
7604 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7605 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7606 _("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
|
7607 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7608 (long)curwin->w_cursor.lnum, |
| 7 | 7609 (long)curbuf->b_ml.ml_line_count, |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7610 (long long)word_count_cursor, (long long)word_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7611 (long long)byte_count_cursor, (long long)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7612 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7613 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7614 _("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
|
7615 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7616 (long)curwin->w_cursor.lnum, |
| 161 | 7617 (long)curbuf->b_ml.ml_line_count, |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7618 (long long)word_count_cursor, (long long)word_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7619 (long long)char_count_cursor, (long long)char_count, |
|
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7620 (long long)byte_count_cursor, (long long)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7621 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7622 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7623 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7624 #ifdef FEAT_MBYTE |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7625 bom_count = bomb_size(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7626 if (bom_count > 0) |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7627 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
|
13614
87e5629fc915
patch 8.0.1679: compiler warning for printf format
Christian Brabandt <cb@256bit.org>
parents:
13610
diff
changeset
|
7628 _("(+%lld for BOM)"), (long long)bom_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7629 #endif |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7630 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7631 { |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7632 /* 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
|
7633 p = p_shm; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7634 p_shm = (char_u *)""; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7635 msg(IObuff); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7636 p_shm = p; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7637 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7638 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7639 #if defined(FEAT_EVAL) |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7640 if (dict != NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7641 { |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7642 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
|
7643 dict_add_number(dict, "chars", char_count); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7644 dict_add_number(dict, "bytes", byte_count |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7645 # ifdef FEAT_MBYTE |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7646 + bom_count |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7647 # endif |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7648 ); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7649 dict_add_number(dict, 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
|
7650 byte_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7651 dict_add_number(dict, 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
|
7652 char_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7653 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
|
7654 word_count_cursor); |
| 7 | 7655 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7656 #endif |
| 7 | 7657 } |