Mercurial > vim
annotate src/ops.c @ 18058:187742518187 v8.1.2024
patch 8.1.2024: delete call commented out for debugging
Commit: https://github.com/vim/vim/commit/9283f92008accd0b797d2c913ce191b490ce3c3d
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 13 21:48:34 2019 +0200
patch 8.1.2024: delete call commented out for debugging
Problem: Delete call commented out for debugging.
Solution: Restore the delete call. (Christian Brabandt)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 13 Sep 2019 22:00:03 +0200 |
parents | ec1717981acf |
children | 0b351691071c |
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 */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
26 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
27 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
|
28 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
29 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 30 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
|
31 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 32 |
33 /* | |
34 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
35 * also op_change, op_shift, op_insert, op_replace - AKelly | |
36 */ | |
37 struct block_def | |
38 { | |
1839 | 39 int startspaces; /* 'extra' cols before first char */ |
40 int endspaces; /* 'extra' cols after last char */ | |
7 | 41 int textlen; /* chars in block */ |
1839 | 42 char_u *textstart; /* pointer to 1st char (partially) in block */ |
43 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 44 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
45 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
46 int is_short; /* TRUE if line is too short to fit in block */ | |
47 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
48 int is_oneChar; /* TRUE if block within one character */ | |
49 int pre_whitesp; /* screen cols of ws before block */ | |
50 int pre_whitesp_c; /* chars of ws before block */ | |
51 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
52 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
53 }; | |
54 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
55 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
|
56 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
|
57 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
|
58 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
|
59 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
60 static void stuffescaped(char_u *arg, int literally); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
61 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
|
62 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
63 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 64 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 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
|
66 static void may_set_selection(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
67 #endif |
17789
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
68 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) |
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
69 static int preprocs_left(void); |
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
70 #endif |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
71 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
|
72 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
|
73 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 74 #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
|
75 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
|
76 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
77 static int ends_in_white(linenr_T lnum); |
7 | 78 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
79 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 80 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
81 static int fmt_check_par(linenr_T); |
7 | 82 #endif |
83 | |
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
|
84 // 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
|
85 #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
|
86 #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
|
87 |
7 | 88 /* |
89 * The names of operators. | |
90 * 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
|
91 * The third field holds OPF_ flags. |
7 | 92 */ |
93 static char opchars[][3] = | |
94 { | |
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
|
95 {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
|
96 {'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
|
97 {'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
|
98 {'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
|
99 {'<', 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
|
100 {'>', 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
|
101 {'!', 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
|
102 {'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
|
103 {'=', 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
|
104 {'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
|
105 {':', 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
|
106 {'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
|
107 {'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
|
108 {'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
|
109 {'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
|
110 {'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
|
111 {'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
|
112 {'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
|
113 {'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
|
114 {'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
|
115 {'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
|
116 {'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
|
117 {'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
|
118 {'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
|
119 {'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
|
120 {'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
|
121 {'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
|
122 {'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
|
123 {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
|
124 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
7 | 125 }; |
126 | |
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
127 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
128 get_y_regs(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
129 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
130 return y_regs; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
131 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
132 |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
133 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
134 get_y_current(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
135 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
136 return y_current; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
137 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
138 |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
139 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
140 get_y_previous(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
141 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
142 return y_previous; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
143 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
144 |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
145 void |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
146 set_y_previous(yankreg_T *yreg) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
147 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
148 y_previous = yreg; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
149 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
150 |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
151 |
7 | 152 /* |
153 * Translate a command name into an operator type. | |
154 * Must only be called with a valid operator name! | |
155 */ | |
156 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
157 get_op_type(int char1, int char2) |
7 | 158 { |
159 int i; | |
160 | |
161 if (char1 == 'r') /* ignore second character */ | |
162 return OP_REPLACE; | |
163 if (char1 == '~') /* when tilde is an operator */ | |
164 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
165 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
|
166 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
167 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
|
168 return OP_NR_SUB; |
7 | 169 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
|
170 { |
7 | 171 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
172 break; | |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
173 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
|
174 { |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
175 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
|
176 break; |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
177 } |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
178 } |
7 | 179 return i; |
180 } | |
181 | |
182 /* | |
183 * Return TRUE if operator "op" always works on whole lines. | |
184 */ | |
185 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
186 op_on_lines(int op) |
7 | 187 { |
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
|
188 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
|
189 } |
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
|
190 |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
191 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
192 /* |
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
|
193 * 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
|
194 */ |
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
|
195 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
|
196 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
|
197 { |
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
|
198 return opchars[op][2] & OPF_CHANGE; |
7 | 199 } |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
200 #endif |
7 | 201 |
202 /* | |
203 * Get first operator command character. | |
204 * Returns 'g' or 'z' if there is another command character. | |
205 */ | |
206 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
207 get_op_char(int optype) |
7 | 208 { |
209 return opchars[optype][0]; | |
210 } | |
211 | |
212 /* | |
213 * Get second operator command character. | |
214 */ | |
215 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
216 get_extra_op_char(int optype) |
7 | 217 { |
218 return opchars[optype][1]; | |
219 } | |
220 | |
221 /* | |
222 * op_shift - handle a shift operation | |
223 */ | |
224 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
225 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 226 { |
227 long i; | |
228 int first_char; | |
229 int block_col = 0; | |
230 | |
231 if (u_save((linenr_T)(oap->start.lnum - 1), | |
232 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
233 return; | |
234 | |
235 if (oap->block_mode) | |
236 block_col = curwin->w_cursor.col; | |
237 | |
238 for (i = oap->line_count; --i >= 0; ) | |
239 { | |
240 first_char = *ml_get_curline(); | |
241 if (first_char == NUL) /* empty line */ | |
242 curwin->w_cursor.col = 0; | |
243 else if (oap->block_mode) | |
244 shift_block(oap, amount); | |
245 else | |
246 /* Move the line right if it doesn't start with '#', 'smartindent' | |
247 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
248 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
249 if (first_char != '#' || !preprocs_left()) | |
250 #endif | |
1516 | 251 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 252 ++curwin->w_cursor.lnum; |
253 } | |
254 | |
255 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
256 if (oap->block_mode) | |
257 { | |
258 curwin->w_cursor.lnum = oap->start.lnum; | |
259 curwin->w_cursor.col = block_col; | |
260 } | |
5735 | 261 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 262 { |
263 curwin->w_cursor.lnum = oap->start.lnum; | |
264 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
265 } | |
266 else | |
267 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
268 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
269 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
270 /* 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
|
271 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
272 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
273 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
274 |
7 | 275 if (oap->line_count > p_report) |
276 { | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
277 char *op; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
278 char *msg_line_single; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
279 char *msg_line_plural; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
280 |
7 | 281 if (oap->op_type == OP_RSHIFT) |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
282 op = ">"; |
7 | 283 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
284 op = "<"; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
285 msg_line_single = NGETTEXT("%ld line %sed %d time", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
286 "%ld line %sed %d times", amount); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
287 msg_line_plural = NGETTEXT("%ld lines %sed %d time", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
288 "%ld lines %sed %d times", amount); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
289 vim_snprintf((char *)IObuff, IOSIZE, |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
290 NGETTEXT(msg_line_single, msg_line_plural, oap->line_count), |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
291 oap->line_count, op, amount); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
292 msg((char *)IObuff); |
7 | 293 } |
294 | |
295 /* | |
296 * Set "'[" and "']" marks. | |
297 */ | |
298 curbuf->b_op_start = oap->start; | |
299 curbuf->b_op_end.lnum = oap->end.lnum; | |
300 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
301 if (curbuf->b_op_end.col > 0) | |
302 --curbuf->b_op_end.col; | |
303 } | |
304 | |
305 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
306 * Shift the current line one shiftwidth left (if left != 0) or right |
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
307 * leaves cursor on first blank in the line. |
7 | 308 */ |
309 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
310 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
311 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
312 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
313 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
314 int call_changed_bytes) /* call changed_bytes() */ |
7 | 315 { |
316 int count; | |
317 int i, j; | |
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
318 int p_sw = (int)get_sw_value_indent(curbuf); |
7 | 319 |
320 count = get_indent(); /* get current indent */ | |
321 | |
322 if (round) /* round off indent */ | |
323 { | |
324 i = count / p_sw; /* number of p_sw rounded down */ | |
325 j = count % p_sw; /* extra spaces */ | |
326 if (j && left) /* first remove extra spaces */ | |
327 --amount; | |
328 if (left) | |
329 { | |
330 i -= amount; | |
331 if (i < 0) | |
332 i = 0; | |
333 } | |
334 else | |
335 i += amount; | |
336 count = i * p_sw; | |
337 } | |
338 else /* original vi indent */ | |
339 { | |
340 if (left) | |
341 { | |
342 count -= p_sw * amount; | |
343 if (count < 0) | |
344 count = 0; | |
345 } | |
346 else | |
347 count += p_sw * amount; | |
348 } | |
349 | |
350 /* Set new indent */ | |
351 if (State & VREPLACE_FLAG) | |
1516 | 352 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 353 else |
1516 | 354 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 355 } |
356 | |
357 /* | |
358 * Shift one line of the current block one shiftwidth right or left. | |
359 * Leaves cursor on first character in block. | |
360 */ | |
361 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
362 shift_block(oparg_T *oap, int amount) |
7 | 363 { |
364 int left = (oap->op_type == OP_LSHIFT); | |
365 int oldstate = State; | |
1839 | 366 int total; |
367 char_u *newp, *oldp; | |
7 | 368 int oldcol = curwin->w_cursor.col; |
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
369 int p_sw = (int)get_sw_value_indent(curbuf); |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
370 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
371 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
|
372 #endif |
7 | 373 int p_ts = (int)curbuf->b_p_ts; |
374 struct block_def bd; | |
375 int incr; | |
1839 | 376 colnr_T ws_vcol; |
7 | 377 int i = 0, j = 0; |
378 int len; | |
379 #ifdef FEAT_RIGHTLEFT | |
380 int old_p_ri = p_ri; | |
381 | |
4352 | 382 p_ri = 0; /* don't want revins in indent */ |
7 | 383 #endif |
384 | |
385 State = INSERT; /* don't want REPLACE for State */ | |
386 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
387 if (bd.is_short) | |
388 return; | |
389 | |
390 /* 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
|
391 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
|
392 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
|
393 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
394 |
7 | 395 oldp = ml_get_curline(); |
396 | |
397 if (!left) | |
398 { | |
399 /* | |
400 * 1. Get start vcol | |
401 * 2. Total ws vcols | |
402 * 3. Divvy into TABs & spp | |
403 * 4. Construct new string | |
404 */ | |
405 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
406 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
407 if (bd.startspaces) | |
408 { | |
409 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
410 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
411 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
412 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
413 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
414 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
415 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
416 bd.startspaces = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
417 } |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
418 } |
1995 | 419 else |
420 ++bd.textstart; | |
7 | 421 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
422 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 423 { |
5995 | 424 /* TODO: is passing bd.textstart for start of the line OK? */ |
425 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
426 (colnr_T)(bd.start_vcol)); | |
7 | 427 total += incr; |
428 bd.start_vcol += incr; | |
429 } | |
430 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
431 * 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
|
432 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
433 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
|
434 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
|
435 else |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
436 j = total; |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
437 #else |
7 | 438 if (!curbuf->b_p_et) |
439 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
440 if (i) | |
441 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
442 else | |
443 j = total; | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
444 #endif |
7 | 445 /* if we're splitting a TAB, allow for it */ |
446 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
447 len = (int)STRLEN(bd.textstart) + 1; | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
448 newp = alloc(bd.textcol + i + j + len); |
7 | 449 if (newp == NULL) |
450 return; | |
451 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
452 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 453 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
454 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 455 /* the end */ |
456 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
457 } | |
458 else /* left */ | |
459 { | |
1839 | 460 colnr_T destination_col; /* column to which text in block will |
461 be shifted */ | |
462 char_u *verbatim_copy_end; /* end of the part of the line which is | |
463 copied verbatim */ | |
464 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
465 of line */ | |
466 unsigned fill; /* nr of spaces that replace a TAB */ | |
467 unsigned new_line_len; /* the length of the line after the | |
468 block shift */ | |
469 size_t block_space_width; | |
470 size_t shift_amount; | |
471 char_u *non_white = bd.textstart; | |
472 colnr_T non_white_col; | |
473 | |
474 /* | |
475 * Firstly, let's find the first non-whitespace character that is | |
476 * displayed after the block's start column and the character's column | |
477 * number. Also, let's calculate the width of all the whitespace | |
478 * characters that are displayed in the block and precede the searched | |
479 * non-whitespace character. | |
480 */ | |
481 | |
482 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
483 * the part of which is displayed at the block's beginning. Let's start | |
484 * searching from the next character. */ | |
485 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
486 MB_PTR_ADV(non_white); |
1839 | 487 |
488 /* The character's column is in "bd.start_vcol". */ | |
489 non_white_col = bd.start_vcol; | |
490 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
491 while (VIM_ISWHITE(*non_white)) |
7 | 492 { |
5995 | 493 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 494 non_white_col += incr; |
7 | 495 } |
1839 | 496 |
497 block_space_width = non_white_col - oap->start_vcol; | |
498 /* We will shift by "total" or "block_space_width", whichever is less. | |
499 */ | |
1860 | 500 shift_amount = (block_space_width < (size_t)total |
501 ? block_space_width : (size_t)total); | |
1839 | 502 |
503 /* The column to which we will shift the text. */ | |
1860 | 504 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 505 |
506 /* Now let's find out how much of the beginning of the line we can | |
507 * reuse without modification. */ | |
508 verbatim_copy_end = bd.textstart; | |
509 verbatim_copy_width = bd.start_vcol; | |
510 | |
511 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
512 * preceding the block. We have to subtract its width to obtain its | |
513 * column number. */ | |
514 if (bd.startspaces) | |
515 verbatim_copy_width -= bd.start_char_vcols; | |
516 while (verbatim_copy_width < destination_col) | |
7 | 517 { |
5995 | 518 char_u *line = verbatim_copy_end; |
519 | |
520 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
521 incr = lbr_chartabsize(line, verbatim_copy_end, | |
522 verbatim_copy_width); | |
1839 | 523 if (verbatim_copy_width + incr > destination_col) |
524 break; | |
525 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
|
526 MB_PTR_ADV(verbatim_copy_end); |
7 | 527 } |
528 | |
1839 | 529 /* If "destination_col" is different from the width of the initial |
530 * part of the line that will be copied, it means we encountered a tab | |
531 * character, which we will have to partly replace with spaces. */ | |
532 fill = destination_col - verbatim_copy_width; | |
533 | |
534 /* The replacement line will consist of: | |
535 * - the beginning of the original line up to "verbatim_copy_end", | |
536 * - "fill" number of spaces, | |
537 * - the rest of the line, pointed to by non_white. */ | |
538 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
539 + fill | |
540 + (unsigned)STRLEN(non_white) + 1; | |
541 | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
542 newp = alloc(new_line_len); |
7 | 543 if (newp == NULL) |
544 return; | |
1839 | 545 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 546 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 547 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 548 } |
549 /* replace the line */ | |
550 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
551 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
552 State = oldstate; | |
553 curwin->w_cursor.col = oldcol; | |
554 #ifdef FEAT_RIGHTLEFT | |
555 p_ri = old_p_ri; | |
556 #endif | |
557 } | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
558 |
7 | 559 /* |
560 * Insert string "s" (b_insert ? before : after) block :AKelly | |
561 * Caller must prepare for undo. | |
562 */ | |
563 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
564 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
565 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
566 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
567 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
568 struct block_def *bdp) |
7 | 569 { |
570 int p_ts; | |
571 int count = 0; /* extra spaces to replace a cut TAB */ | |
572 int spaces = 0; /* non-zero if cutting a TAB */ | |
573 colnr_T offset; /* pointer along new line */ | |
574 unsigned s_len; /* STRLEN(s) */ | |
575 char_u *newp, *oldp; /* new, old lines */ | |
576 linenr_T lnum; /* loop var */ | |
577 int oldstate = State; | |
578 | |
579 State = INSERT; /* don't want REPLACE for State */ | |
580 s_len = (unsigned)STRLEN(s); | |
581 | |
582 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
583 { | |
584 block_prep(oap, bdp, lnum, TRUE); | |
585 if (bdp->is_short && b_insert) | |
586 continue; /* OP_INSERT, line ends before block start */ | |
587 | |
588 oldp = ml_get(lnum); | |
589 | |
590 if (b_insert) | |
591 { | |
592 p_ts = bdp->start_char_vcols; | |
593 spaces = bdp->startspaces; | |
594 if (spaces != 0) | |
595 count = p_ts - 1; /* we're cutting a TAB */ | |
596 offset = bdp->textcol; | |
597 } | |
598 else /* append */ | |
599 { | |
600 p_ts = bdp->end_char_vcols; | |
601 if (!bdp->is_short) /* spaces = padding after block */ | |
602 { | |
603 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
604 if (spaces != 0) | |
605 count = p_ts - 1; /* we're cutting a TAB */ | |
606 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
607 } | |
608 else /* spaces = padding to block edge */ | |
609 { | |
610 /* if $ used, just append to EOL (ie spaces==0) */ | |
611 if (!bdp->is_MAX) | |
612 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
613 count = spaces; | |
614 offset = bdp->textcol + bdp->textlen; | |
615 } | |
616 } | |
617 | |
6140 | 618 if (has_mbyte && spaces > 0) |
619 { | |
6460 | 620 int off; |
621 | |
6140 | 622 /* Avoid starting halfway a multi-byte character. */ |
623 if (b_insert) | |
624 { | |
6460 | 625 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 626 } |
627 else | |
628 { | |
6460 | 629 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 630 offset += off; |
631 } | |
6460 | 632 spaces -= off; |
633 count -= off; | |
6140 | 634 } |
635 | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
636 newp = alloc(STRLEN(oldp) + s_len + count + 1); |
7 | 637 if (newp == NULL) |
638 continue; | |
639 | |
640 /* copy up to shifted part */ | |
641 mch_memmove(newp, oldp, (size_t)(offset)); | |
642 oldp += offset; | |
643 | |
644 /* insert pre-padding */ | |
6929 | 645 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 646 |
647 /* copy the new text */ | |
648 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
649 offset += s_len; | |
650 | |
651 if (spaces && !bdp->is_short) | |
652 { | |
653 /* insert post-padding */ | |
6929 | 654 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 655 /* We're splitting a TAB, don't copy it. */ |
656 oldp++; | |
657 /* We allowed for that TAB, remember this now */ | |
658 count++; | |
659 } | |
660 | |
661 if (spaces > 0) | |
662 offset += count; | |
1622 | 663 STRMOVE(newp + offset, oldp); |
7 | 664 |
665 ml_replace(lnum, newp, FALSE); | |
666 | |
667 if (lnum == oap->end.lnum) | |
668 { | |
669 /* Set "']" mark to the end of the block instead of the end of | |
670 * the insert in the first line. */ | |
671 curbuf->b_op_end.lnum = oap->end.lnum; | |
672 curbuf->b_op_end.col = offset; | |
673 } | |
674 } /* for all lnum */ | |
675 | |
676 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
677 | |
678 State = oldstate; | |
679 } | |
680 | |
681 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
682 /* | |
683 * op_reindent - handle reindenting a block of lines. | |
684 */ | |
685 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
686 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 687 { |
688 long i; | |
689 char_u *l; | |
6971 | 690 int amount; |
7 | 691 linenr_T first_changed = 0; |
692 linenr_T last_changed = 0; | |
693 linenr_T start_lnum = curwin->w_cursor.lnum; | |
694 | |
216 | 695 /* Don't even try when 'modifiable' is off. */ |
696 if (!curbuf->b_p_ma) | |
697 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
698 emsg(_(e_modifiable)); |
216 | 699 return; |
700 } | |
701 | |
7 | 702 for (i = oap->line_count; --i >= 0 && !got_int; ) |
703 { | |
704 /* it's a slow thing to do, so give feedback so there's no worry that | |
705 * the computer's just hung. */ | |
706 | |
707 if (i > 1 | |
708 && (i % 50 == 0 || i == oap->line_count - 1) | |
709 && oap->line_count > p_report) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
710 smsg(_("%ld lines to indent... "), i); |
7 | 711 |
712 /* | |
713 * Be vi-compatible: For lisp indenting the first line is not | |
714 * indented, unless there is only one line. | |
715 */ | |
716 #ifdef FEAT_LISP | |
717 if (i != oap->line_count - 1 || oap->line_count == 1 | |
718 || how != get_lisp_indent) | |
719 #endif | |
720 { | |
721 l = skipwhite(ml_get_curline()); | |
722 if (*l == NUL) /* empty or blank line */ | |
6971 | 723 amount = 0; |
7 | 724 else |
6971 | 725 amount = how(); /* get the indent for this line */ |
726 | |
727 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 728 { |
729 /* did change the indent, call changed_lines() later */ | |
730 if (first_changed == 0) | |
731 first_changed = curwin->w_cursor.lnum; | |
732 last_changed = curwin->w_cursor.lnum; | |
733 } | |
734 } | |
735 ++curwin->w_cursor.lnum; | |
1550 | 736 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 737 } |
738 | |
739 /* put cursor on first non-blank of indented line */ | |
740 curwin->w_cursor.lnum = start_lnum; | |
741 beginline(BL_SOL | BL_FIX); | |
742 | |
743 /* Mark changed lines so that they will be redrawn. When Visual | |
744 * highlighting was present, need to continue until the last line. When | |
745 * there is no change still need to remove the Visual highlighting. */ | |
746 if (last_changed != 0) | |
747 changed_lines(first_changed, 0, | |
748 oap->is_VIsual ? start_lnum + oap->line_count : | |
749 last_changed + 1, 0L); | |
750 else if (oap->is_VIsual) | |
751 redraw_curbuf_later(INVERTED); | |
752 | |
753 if (oap->line_count > p_report) | |
754 { | |
755 i = oap->line_count - (i + 1); | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
756 smsg(NGETTEXT("%ld line indented ", |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
757 "%ld lines indented ", i), i); |
7 | 758 } |
759 /* set '[ and '] marks */ | |
760 curbuf->b_op_start = oap->start; | |
761 curbuf->b_op_end = oap->end; | |
762 } | |
763 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
764 | |
765 #if defined(FEAT_EVAL) || defined(PROTO) | |
766 /* | |
767 * Keep the last expression line here, for repeating. | |
768 */ | |
769 static char_u *expr_line = NULL; | |
770 | |
771 /* | |
772 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
773 * Returns '=' when OK, NUL otherwise. | |
774 */ | |
775 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
776 get_expr_register(void) |
7 | 777 { |
778 char_u *new_line; | |
779 | |
17178
40c4cb095d53
patch 8.1.1588: in :let-heredoc line continuation is recognized
Bram Moolenaar <Bram@vim.org>
parents:
17063
diff
changeset
|
780 new_line = getcmdline('=', 0L, 0, TRUE); |
7 | 781 if (new_line == NULL) |
782 return NUL; | |
783 if (*new_line == NUL) /* use previous line */ | |
784 vim_free(new_line); | |
785 else | |
786 set_expr_line(new_line); | |
787 return '='; | |
788 } | |
789 | |
790 /* | |
791 * Set the expression for the '=' register. | |
792 * Argument must be an allocated string. | |
793 */ | |
794 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
795 set_expr_line(char_u *new_line) |
7 | 796 { |
797 vim_free(expr_line); | |
798 expr_line = new_line; | |
799 } | |
800 | |
801 /* | |
802 * Get the result of the '=' register expression. | |
803 * Returns a pointer to allocated memory, or NULL for failure. | |
804 */ | |
805 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
806 get_expr_line(void) |
7 | 807 { |
808 char_u *expr_copy; | |
809 char_u *rv; | |
994 | 810 static int nested = 0; |
7 | 811 |
812 if (expr_line == NULL) | |
813 return NULL; | |
814 | |
815 /* Make a copy of the expression, because evaluating it may cause it to be | |
816 * changed. */ | |
817 expr_copy = vim_strsave(expr_line); | |
818 if (expr_copy == NULL) | |
819 return NULL; | |
820 | |
994 | 821 /* When we are invoked recursively limit the evaluation to 10 levels. |
822 * Then return the string as-is. */ | |
823 if (nested >= 10) | |
824 return expr_copy; | |
825 | |
826 ++nested; | |
714 | 827 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 828 --nested; |
7 | 829 vim_free(expr_copy); |
830 return rv; | |
831 } | |
283 | 832 |
833 /* | |
834 * Get the '=' register expression itself, without evaluating it. | |
835 */ | |
17789
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
836 static char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
837 get_expr_line_src(void) |
283 | 838 { |
839 if (expr_line == NULL) | |
840 return NULL; | |
841 return vim_strsave(expr_line); | |
842 } | |
7 | 843 #endif /* FEAT_EVAL */ |
844 | |
845 /* | |
846 * Check if 'regname' is a valid name of a yank register. | |
847 * Note: There is no check for 0 (default register), caller should do this | |
848 */ | |
849 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
850 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
851 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
852 int writing) /* if TRUE check for writable registers */ |
7 | 853 { |
854 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
855 || (!writing && vim_strchr((char_u *) | |
856 #ifdef FEAT_EVAL | |
6557 | 857 "/.%:=" |
7 | 858 #else |
6557 | 859 "/.%:" |
7 | 860 #endif |
861 , regname) != NULL) | |
6557 | 862 || regname == '#' |
7 | 863 || regname == '"' |
864 || regname == '-' | |
865 || regname == '_' | |
866 #ifdef FEAT_CLIPBOARD | |
867 || regname == '*' | |
868 || regname == '+' | |
869 #endif | |
870 #ifdef FEAT_DND | |
871 || (!writing && regname == '~') | |
872 #endif | |
873 ) | |
874 return TRUE; | |
875 return FALSE; | |
876 } | |
877 | |
878 /* | |
879 * Set y_current and y_append, according to the value of "regname". | |
880 * Cannot handle the '_' register. | |
140 | 881 * Must only be called with a valid register name! |
7 | 882 * |
883 * If regname is 0 and writing, use register 0 | |
884 * 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
|
885 * |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
886 * 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
|
887 * clipboard). |
7 | 888 */ |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
889 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
890 get_yank_register(int regname, int writing) |
7 | 891 { |
892 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
|
893 int ret = FALSE; |
7 | 894 |
895 y_append = FALSE; | |
896 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
897 { | |
898 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
|
899 return ret; |
7 | 900 } |
901 i = regname; | |
902 if (VIM_ISDIGIT(i)) | |
903 i -= '0'; | |
904 else if (ASCII_ISLOWER(i)) | |
905 i = CharOrdLow(i) + 10; | |
906 else if (ASCII_ISUPPER(i)) | |
907 { | |
908 i = CharOrdUp(i) + 10; | |
909 y_append = TRUE; | |
910 } | |
911 else if (regname == '-') | |
912 i = DELETION_REGISTER; | |
913 #ifdef FEAT_CLIPBOARD | |
914 /* When selection is not available, use register 0 instead of '*' */ | |
915 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
|
916 { |
7 | 917 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
|
918 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
919 } |
7 | 920 /* When clipboard is not available, use register 0 instead of '+' */ |
921 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
|
922 { |
7 | 923 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
|
924 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
925 } |
7 | 926 #endif |
927 #ifdef FEAT_DND | |
928 else if (!writing && regname == '~') | |
929 i = TILDE_REGISTER; | |
930 #endif | |
931 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
932 i = 0; | |
933 y_current = &(y_regs[i]); | |
934 if (writing) /* remember the register we write into for do_put() */ | |
935 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
|
936 return ret; |
7 | 937 } |
938 | |
15 | 939 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 940 /* |
941 * When "regname" is a clipboard register, obtain the selection. If it's not | |
942 * available return zero, otherwise return "regname". | |
943 */ | |
15 | 944 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
945 may_get_selection(int regname) |
7 | 946 { |
947 if (regname == '*') | |
948 { | |
949 if (!clip_star.available) | |
950 regname = 0; | |
951 else | |
952 clip_get_selection(&clip_star); | |
953 } | |
954 else if (regname == '+') | |
955 { | |
956 if (!clip_plus.available) | |
957 regname = 0; | |
958 else | |
959 clip_get_selection(&clip_plus); | |
960 } | |
961 return regname; | |
962 } | |
963 #endif | |
964 | |
965 /* | |
966 * Obtain the contents of a "normal" register. The register is made empty. | |
967 * The returned pointer has allocated memory, use put_register() later. | |
968 */ | |
969 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
970 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
971 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
972 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 973 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
974 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
975 int i; |
7 | 976 |
977 #ifdef FEAT_CLIPBOARD | |
978 /* When Visual area changed, may have to update selection. Obtain the | |
979 * selection too. */ | |
1435 | 980 if (name == '*' && clip_star.available) |
7 | 981 { |
3674 | 982 if (clip_isautosel_star()) |
983 clip_update_selection(&clip_star); | |
984 may_get_selection(name); | |
985 } | |
986 if (name == '+' && clip_plus.available) | |
987 { | |
988 if (clip_isautosel_plus()) | |
989 clip_update_selection(&clip_plus); | |
7 | 990 may_get_selection(name); |
991 } | |
992 #endif | |
993 | |
994 get_yank_register(name, 0); | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
995 reg = ALLOC_ONE(yankreg_T); |
7 | 996 if (reg != NULL) |
997 { | |
998 *reg = *y_current; | |
999 if (copy) | |
1000 { | |
1001 /* If we run out of memory some or all of the lines are empty. */ | |
1002 if (reg->y_size == 0) | |
1003 reg->y_array = NULL; | |
1004 else | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
1005 reg->y_array = ALLOC_MULT(char_u *, reg->y_size); |
7 | 1006 if (reg->y_array != NULL) |
1007 { | |
1008 for (i = 0; i < reg->y_size; ++i) | |
1009 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1010 } | |
1011 } | |
1012 else | |
1013 y_current->y_array = NULL; | |
1014 } | |
1015 return (void *)reg; | |
1016 } | |
1017 | |
1018 /* | |
1451 | 1019 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1020 */ |
1021 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1022 put_register(int name, void *reg) |
7 | 1023 { |
1024 get_yank_register(name, 0); | |
1025 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1026 *y_current = *(yankreg_T *)reg; |
1451 | 1027 vim_free(reg); |
7 | 1028 |
5735 | 1029 #ifdef FEAT_CLIPBOARD |
7 | 1030 /* Send text written to clipboard register to the clipboard. */ |
1031 may_set_selection(); | |
5735 | 1032 #endif |
7 | 1033 } |
4209 | 1034 |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1035 #if (defined(FEAT_CLIPBOARD) && defined(FEAT_X11) && defined(USE_SYSTEM)) \ |
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1036 || defined(PROTO) |
4209 | 1037 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1038 free_register(void *reg) |
4209 | 1039 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1040 yankreg_T tmp; |
4209 | 1041 |
1042 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1043 *y_current = *(yankreg_T *)reg; |
4209 | 1044 free_yank_all(); |
1045 vim_free(reg); | |
1046 *y_current = tmp; | |
1047 } | |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1048 #endif |
7 | 1049 |
1050 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1051 /* | |
1052 * return TRUE if the current yank register has type MLINE | |
1053 */ | |
1054 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1055 yank_register_mline(int regname) |
7 | 1056 { |
1057 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1058 return FALSE; | |
1059 if (regname == '_') /* black hole is always empty */ | |
1060 return FALSE; | |
1061 get_yank_register(regname, FALSE); | |
1062 return (y_current->y_type == MLINE); | |
1063 } | |
1064 #endif | |
1065 | |
1066 /* | |
1157 | 1067 * Start or stop recording into a yank register. |
7 | 1068 * |
1157 | 1069 * Return FAIL for failure, OK otherwise. |
7 | 1070 */ |
1071 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1072 do_record(int c) |
7 | 1073 { |
1157 | 1074 char_u *p; |
1075 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1076 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1077 int retval; |
7 | 1078 |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1079 if (reg_recording == 0) /* start recording */ |
7 | 1080 { |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1081 /* registers 0-9, a-z and " are allowed */ |
7 | 1082 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
1083 retval = FAIL; | |
1084 else | |
1085 { | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1086 reg_recording = c; |
7 | 1087 showmode(); |
1088 regname = c; | |
1089 retval = OK; | |
1090 } | |
1091 } | |
1092 else /* stop recording */ | |
1093 { | |
1094 /* | |
1157 | 1095 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1096 * needs to be removed again to put it in a register. exec_reg then | |
1097 * adds the escaping back later. | |
7 | 1098 */ |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1099 reg_recording = 0; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
1100 msg(""); |
7 | 1101 p = get_recorded(); |
1102 if (p == NULL) | |
1103 retval = FAIL; | |
1104 else | |
1105 { | |
1081 | 1106 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1107 vim_unescape_csi(p); | |
1108 | |
7 | 1109 /* |
1110 * We don't want to change the default register here, so save and | |
1111 * restore the current register name. | |
1112 */ | |
1113 old_y_previous = y_previous; | |
1114 old_y_current = y_current; | |
1115 | |
1116 retval = stuff_yank(regname, p); | |
1117 | |
1118 y_previous = old_y_previous; | |
1119 y_current = old_y_current; | |
1120 } | |
1121 } | |
1122 return retval; | |
1123 } | |
1124 | |
1125 /* | |
1126 * Stuff string "p" into yank register "regname" as a single line (append if | |
1127 * uppercase). "p" must have been alloced. | |
1128 * | |
1129 * return FAIL for failure, OK otherwise | |
1130 */ | |
1131 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1132 stuff_yank(int regname, char_u *p) |
7 | 1133 { |
1134 char_u *lp; | |
1135 char_u **pp; | |
1136 | |
1137 /* check for read-only register */ | |
1138 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1139 { | |
1140 vim_free(p); | |
1141 return FAIL; | |
1142 } | |
1143 if (regname == '_') /* black hole: don't do anything */ | |
1144 { | |
1145 vim_free(p); | |
1146 return OK; | |
1147 } | |
1148 get_yank_register(regname, TRUE); | |
1149 if (y_append && y_current->y_array != NULL) | |
1150 { | |
1151 pp = &(y_current->y_array[y_current->y_size - 1]); | |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1152 lp = alloc(STRLEN(*pp) + STRLEN(p) + 1); |
7 | 1153 if (lp == NULL) |
1154 { | |
1155 vim_free(p); | |
1156 return FAIL; | |
1157 } | |
1158 STRCPY(lp, *pp); | |
1159 STRCAT(lp, p); | |
1160 vim_free(p); | |
1161 vim_free(*pp); | |
1162 *pp = lp; | |
1163 } | |
1164 else | |
1165 { | |
1166 free_yank_all(); | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
1167 if ((y_current->y_array = ALLOC_ONE(char_u *)) == NULL) |
7 | 1168 { |
1169 vim_free(p); | |
1170 return FAIL; | |
1171 } | |
1172 y_current->y_array[0] = p; | |
1173 y_current->y_size = 1; | |
1174 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
|
1175 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1176 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
|
1177 #endif |
7 | 1178 } |
1179 return OK; | |
1180 } | |
1181 | |
1893 | 1182 static int execreg_lastc = NUL; |
1183 | |
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1184 int |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1185 get_execreg_lastc(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1186 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1187 return execreg_lastc; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1188 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1189 |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1190 void |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1191 set_execreg_lastc(int lastc) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1192 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1193 execreg_lastc = lastc; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1194 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1195 |
7 | 1196 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1197 * Execute a yank register: copy it into the stuff buffer. |
7 | 1198 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1199 * Return FAIL for failure, OK otherwise. |
7 | 1200 */ |
1201 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1202 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1203 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1204 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1205 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
|
1206 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1207 { |
1208 long i; | |
1209 char_u *p; | |
1210 int retval = OK; | |
1211 int remap; | |
1212 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1213 // repeat previous one |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1214 if (regname == '@') |
168 | 1215 { |
1893 | 1216 if (execreg_lastc == NUL) |
168 | 1217 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1218 emsg(_("E748: No previously used register")); |
168 | 1219 return FAIL; |
1220 } | |
1893 | 1221 regname = execreg_lastc; |
168 | 1222 } |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1223 // check for valid regname |
7 | 1224 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) |
168 | 1225 { |
1226 emsg_invreg(regname); | |
7 | 1227 return FAIL; |
168 | 1228 } |
1893 | 1229 execreg_lastc = regname; |
7 | 1230 |
1231 #ifdef FEAT_CLIPBOARD | |
1232 regname = may_get_selection(regname); | |
1233 #endif | |
1234 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1235 // black hole: don't stuff anything |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1236 if (regname == '_') |
7 | 1237 return OK; |
1238 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1239 // use last command line |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1240 if (regname == ':') |
7 | 1241 { |
1242 if (last_cmdline == NULL) | |
1243 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1244 emsg(_(e_nolastcmd)); |
7 | 1245 return FAIL; |
1246 } | |
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1247 // don't keep the cmdline containing @: |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1248 VIM_CLEAR(new_last_cmdline); |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1249 // Escape all control characters with a CTRL-V |
16 | 1250 p = vim_strsave_escaped_ext(last_cmdline, |
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1251 (char_u *)"\001\002\003\004\005\006\007" |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1252 "\010\011\012\013\014\015\016\017" |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1253 "\020\021\022\023\024\025\026\027" |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1254 "\030\031\032\033\034\035\036\037", |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1255 Ctrl_V, FALSE); |
16 | 1256 if (p != NULL) |
480 | 1257 { |
1258 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1259 * Remove it when it's already there. */ | |
1260 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1261 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1262 else |
1077 | 1263 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1264 } |
16 | 1265 vim_free(p); |
7 | 1266 } |
1267 #ifdef FEAT_EVAL | |
1268 else if (regname == '=') | |
1269 { | |
1270 p = get_expr_line(); | |
1271 if (p == NULL) | |
1272 return FAIL; | |
1077 | 1273 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1274 vim_free(p); |
1275 } | |
1276 #endif | |
1277 else if (regname == '.') /* use last inserted text */ | |
1278 { | |
1279 p = get_last_insert_save(); | |
1280 if (p == NULL) | |
1281 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1282 emsg(_(e_noinstext)); |
7 | 1283 return FAIL; |
1284 } | |
1077 | 1285 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1286 vim_free(p); |
1287 } | |
1288 else | |
1289 { | |
1290 get_yank_register(regname, FALSE); | |
1291 if (y_current->y_array == NULL) | |
1292 return FAIL; | |
1293 | |
1294 /* Disallow remaping for ":@r". */ | |
1295 remap = colon ? REMAP_NONE : REMAP_YES; | |
1296 | |
1297 /* | |
1298 * Insert lines into typeahead buffer, from last one to first one. | |
1299 */ | |
1034 | 1300 put_reedit_in_typebuf(silent); |
7 | 1301 for (i = y_current->y_size; --i >= 0; ) |
1302 { | |
1077 | 1303 char_u *escaped; |
1304 | |
7 | 1305 /* insert NL between lines and after last line if type is MLINE */ |
1306 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1307 || addcr) | |
1308 { | |
1034 | 1309 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1310 return FAIL; |
1311 } | |
1077 | 1312 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1313 if (escaped == NULL) | |
1314 return FAIL; | |
1315 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1316 vim_free(escaped); | |
1317 if (retval == FAIL) | |
7 | 1318 return FAIL; |
1034 | 1319 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1320 == FAIL) |
1321 return FAIL; | |
1322 } | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1323 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
7 | 1324 } |
1325 return retval; | |
1326 } | |
1327 | |
1328 /* | |
1329 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1330 * used only after other typeahead has been processed. | |
1331 */ | |
1332 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1333 put_reedit_in_typebuf(int silent) |
7 | 1334 { |
1335 char_u buf[3]; | |
1336 | |
1337 if (restart_edit != NUL) | |
1338 { | |
1339 if (restart_edit == 'V') | |
1340 { | |
1341 buf[0] = 'g'; | |
1342 buf[1] = 'R'; | |
1343 buf[2] = NUL; | |
1344 } | |
1345 else | |
1346 { | |
1347 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1348 buf[1] = NUL; | |
1349 } | |
1034 | 1350 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1351 restart_edit = NUL; |
1352 } | |
1353 } | |
1354 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1355 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1356 * 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
|
1357 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1358 * 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
|
1359 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1360 */ |
7 | 1361 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1362 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1363 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1364 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1365 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1366 int silent) |
7 | 1367 { |
1368 int retval = OK; | |
1369 | |
1034 | 1370 put_reedit_in_typebuf(silent); |
7 | 1371 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1372 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1373 if (retval == OK) |
1077 | 1374 { |
1375 char_u *p; | |
1376 | |
1377 if (esc) | |
1378 p = vim_strsave_escape_csi(s); | |
1379 else | |
1380 p = s; | |
1381 if (p == NULL) | |
1382 retval = FAIL; | |
1383 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1384 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
|
1385 0, TRUE, silent); |
1077 | 1386 if (esc) |
1387 vim_free(p); | |
1388 } | |
7 | 1389 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1390 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1391 return retval; |
1392 } | |
1393 | |
1394 /* | |
1395 * Insert a yank register: copy it into the Read buffer. | |
1396 * Used by CTRL-R command and middle mouse button in insert mode. | |
1397 * | |
1398 * return FAIL for failure, OK otherwise | |
1399 */ | |
1400 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1401 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1402 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
|
1403 int literally_arg) /* insert literally, not as if typed */ |
7 | 1404 { |
1405 long i; | |
1406 int retval = OK; | |
1407 char_u *arg; | |
1408 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
|
1409 int literally = literally_arg; |
7 | 1410 |
1411 /* | |
1412 * It is possible to get into an endless loop by having CTRL-R a in | |
1413 * register a and then, in insert mode, doing CTRL-R a. | |
1414 * If you hit CTRL-C, the loop will be broken here. | |
1415 */ | |
1416 ui_breakcheck(); | |
1417 if (got_int) | |
1418 return FAIL; | |
1419 | |
1420 /* check for valid regname */ | |
1421 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1422 return FAIL; | |
1423 | |
1424 #ifdef FEAT_CLIPBOARD | |
1425 regname = may_get_selection(regname); | |
1426 #endif | |
1427 | |
1428 if (regname == '.') /* insert last inserted text */ | |
1429 retval = stuff_inserted(NUL, 1L, TRUE); | |
1430 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1431 { | |
1432 if (arg == NULL) | |
1433 return FAIL; | |
1434 stuffescaped(arg, literally); | |
1435 if (allocated) | |
1436 vim_free(arg); | |
1437 } | |
1438 else /* name or number register */ | |
1439 { | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1440 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
|
1441 literally = TRUE; |
7 | 1442 if (y_current->y_array == NULL) |
1443 retval = FAIL; | |
1444 else | |
1445 { | |
1446 for (i = 0; i < y_current->y_size; ++i) | |
1447 { | |
1448 stuffescaped(y_current->y_array[i], literally); | |
1449 /* | |
1450 * Insert a newline between lines and after last line if | |
1451 * y_type is MLINE. | |
1452 */ | |
1453 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1454 stuffcharReadbuff('\n'); | |
1455 } | |
1456 } | |
1457 } | |
1458 | |
1459 return retval; | |
1460 } | |
1461 | |
1462 /* | |
1463 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1464 * literally ("literally" TRUE) or interpret is as typed characters. | |
1465 */ | |
1466 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1467 stuffescaped(char_u *arg, int literally) |
7 | 1468 { |
1469 int c; | |
1470 char_u *start; | |
1471 | |
1472 while (*arg != NUL) | |
1473 { | |
1474 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1475 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1476 * is TRUE. */ | |
1477 start = arg; | |
1478 while ((*arg >= ' ' | |
1479 #ifndef EBCDIC | |
1480 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1481 #endif | |
1482 ) | |
1483 || (*arg == K_SPECIAL && !literally)) | |
1484 ++arg; | |
1485 if (arg > start) | |
1486 stuffReadbuffLen(start, (long)(arg - start)); | |
1487 | |
1488 /* stuff a single special character */ | |
1489 if (*arg != NUL) | |
1490 { | |
1491 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
|
1492 c = mb_cptr2char_adv(&arg); |
7 | 1493 else |
1494 c = *arg++; | |
1495 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1496 stuffcharReadbuff(Ctrl_V); | |
1497 stuffcharReadbuff(c); | |
1498 } | |
1499 } | |
1500 } | |
1501 | |
1502 /* | |
1157 | 1503 * If "regname" is a special register, return TRUE and store a pointer to its |
1504 * value in "argp". | |
7 | 1505 */ |
15 | 1506 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1507 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1508 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1509 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1510 int *allocated, /* return: TRUE when value was allocated */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1511 int errmsg) /* give error message when failing */ |
7 | 1512 { |
1513 int cnt; | |
1514 | |
1515 *argp = NULL; | |
1516 *allocated = FALSE; | |
1517 switch (regname) | |
1518 { | |
1519 case '%': /* file name */ | |
1520 if (errmsg) | |
1521 check_fname(); /* will give emsg if not set */ | |
1522 *argp = curbuf->b_fname; | |
1523 return TRUE; | |
1524 | |
1525 case '#': /* alternate file name */ | |
1526 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1527 return TRUE; | |
1528 | |
1529 #ifdef FEAT_EVAL | |
1530 case '=': /* result of expression */ | |
1531 *argp = get_expr_line(); | |
1532 *allocated = TRUE; | |
1533 return TRUE; | |
1534 #endif | |
1535 | |
1536 case ':': /* last command line */ | |
1537 if (last_cmdline == NULL && errmsg) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1538 emsg(_(e_nolastcmd)); |
7 | 1539 *argp = last_cmdline; |
1540 return TRUE; | |
1541 | |
1542 case '/': /* last search-pattern */ | |
1543 if (last_search_pat() == NULL && errmsg) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1544 emsg(_(e_noprevre)); |
7 | 1545 *argp = last_search_pat(); |
1546 return TRUE; | |
1547 | |
1548 case '.': /* last inserted text */ | |
1549 *argp = get_last_insert_save(); | |
1550 *allocated = TRUE; | |
1551 if (*argp == NULL && errmsg) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1552 emsg(_(e_noinstext)); |
7 | 1553 return TRUE; |
1554 | |
1555 #ifdef FEAT_SEARCHPATH | |
1556 case Ctrl_F: /* Filename under cursor */ | |
1557 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1558 if (!errmsg) | |
1559 return FALSE; | |
1560 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1561 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1562 *allocated = TRUE; |
1563 return TRUE; | |
1564 #endif | |
1565 | |
1566 case Ctrl_W: /* word under cursor */ | |
1567 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1568 if (!errmsg) | |
1569 return FALSE; | |
1570 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1571 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1572 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1573 *allocated = TRUE; | |
1574 return TRUE; | |
1575 | |
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1576 case Ctrl_L: /* Line under cursor */ |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1577 if (!errmsg) |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1578 return FALSE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1579 |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 *argp = ml_get_buf(curwin->w_buffer, |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1581 curwin->w_cursor.lnum, FALSE); |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1582 return TRUE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1583 |
7 | 1584 case '_': /* black hole: always empty */ |
1585 *argp = (char_u *)""; | |
1586 return TRUE; | |
1587 } | |
1588 | |
1589 return FALSE; | |
1590 } | |
1591 | |
1592 /* | |
15 | 1593 * Paste a yank register into the command line. |
1594 * Only for non-special registers. | |
1595 * Used by CTRL-R command in command-line mode | |
7 | 1596 * insert_reg() can't be used here, because special characters from the |
1597 * register contents will be interpreted as commands. | |
1598 * | |
1599 * return FAIL for failure, OK otherwise | |
1600 */ | |
1601 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1602 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1603 int regname, |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1604 int literally_arg, /* Insert text literally instead of "as typed" */ |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1605 int remcr) /* don't add CR characters */ |
7 | 1606 { |
1607 long i; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1608 int literally = literally_arg; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1609 |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1610 if (get_yank_register(regname, FALSE)) |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1611 literally = TRUE; |
7 | 1612 if (y_current->y_array == NULL) |
1613 return FAIL; | |
1614 | |
1615 for (i = 0; i < y_current->y_size; ++i) | |
1616 { | |
1617 cmdline_paste_str(y_current->y_array[i], literally); | |
1618 | |
1015 | 1619 /* Insert ^M between lines and after last line if type is MLINE. |
7336
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1620 * Don't do this when "remcr" is TRUE. */ |
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1621 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1622 cmdline_paste_str((char_u *)"\r", literally); |
1623 | |
1624 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1625 * lines and gets bored. */ | |
1626 ui_breakcheck(); | |
1627 if (got_int) | |
1628 return FAIL; | |
1629 } | |
1630 return OK; | |
1631 } | |
1632 | |
1633 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1634 /* | |
1635 * Adjust the register name pointed to with "rp" for the clipboard being | |
1636 * used always and the clipboard being available. | |
1637 */ | |
1638 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1639 adjust_clip_reg(int *rp) |
7 | 1640 { |
2654 | 1641 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1642 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1643 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1644 { | |
1645 if (clip_unnamed != 0) | |
1646 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1647 ? '+' : '*'; |
6116 | 1648 else |
1649 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1650 ? '+' : '*'; | |
1651 } | |
7 | 1652 if (!clip_star.available && *rp == '*') |
1653 *rp = 0; | |
1654 if (!clip_plus.available && *rp == '+') | |
1655 *rp = 0; | |
1656 } | |
1657 #endif | |
1658 | |
1659 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1660 * Shift the delete registers: "9 is cleared, "8 becomes "9, etc. |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1661 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1662 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 shift_delete_registers() |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1664 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1665 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1666 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1667 y_current = &y_regs[9]; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1668 free_yank_all(); /* free register nine */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1669 for (n = 9; n > 1; --n) |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1670 y_regs[n] = y_regs[n - 1]; |
11597
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1671 y_current = &y_regs[1]; |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1672 if (!y_append) |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1673 y_previous = y_current; |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1674 y_regs[1].y_array = NULL; /* set register one to empty */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1675 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1676 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1677 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1678 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 yank_do_autocmd(oparg_T *oap, yankreg_T *reg) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1680 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 return; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 v_event = get_vim_var_dict(VV_EVENT); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 list = list_alloc(); |
13254
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1694 if (list == NULL) |
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1695 return; |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 for (n = 0; n < reg->y_size; n++) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1697 list_append_string(list, reg->y_array[n], -1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1698 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 dict_add_list(v_event, "regcontents", list); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 buf[0] = (char_u)oap->regname; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 buf[1] = NUL; |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1703 dict_add_string(v_event, "regname", buf); |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1704 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1705 buf[0] = get_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 buf[1] = get_extra_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1707 buf[2] = NUL; |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1708 dict_add_string(v_event, "operator", buf); |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1710 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 switch (get_reg_type(oap->regname, ®len)) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1713 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 case MLINE: buf[0] = 'V'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1715 case MCHAR: buf[0] = 'v'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1716 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 vim_snprintf((char *)buf, sizeof(buf), "%c%ld", Ctrl_V, |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1718 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1719 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 } |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1721 dict_add_string(v_event, "regtype", buf); |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1722 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1723 /* Lock the dictionary and its keys */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1724 dict_set_items_ro(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1725 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1726 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 apply_autocmds(EVENT_TEXTYANKPOST, NULL, NULL, FALSE, curbuf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1730 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 /* Empty the dictionary, v:event is still valid */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1734 hash_init(&v_event->dv_hashtab); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1735 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1736 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1737 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1738 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1739 * Handle a delete operation. |
7 | 1740 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1741 * Return FAIL if undo failed, OK otherwise. |
7 | 1742 */ |
1743 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1744 op_delete(oparg_T *oap) |
7 | 1745 { |
1746 int n; | |
1747 linenr_T lnum; | |
1748 char_u *ptr; | |
1749 char_u *newp, *oldp; | |
1750 struct block_def bd; | |
1751 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1752 int did_yank = FALSE; | |
1753 | |
1754 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1755 return OK; | |
1756 | |
1757 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1758 if (oap->empty) | |
1759 return u_save_cursor(); | |
1760 | |
1761 if (!curbuf->b_p_ma) | |
1762 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1763 emsg(_(e_modifiable)); |
7 | 1764 return FAIL; |
1765 } | |
1766 | |
1767 #ifdef FEAT_CLIPBOARD | |
1768 adjust_clip_reg(&oap->regname); | |
1769 #endif | |
1770 | |
1771 if (has_mbyte) | |
1772 mb_adjust_opend(oap); | |
1773 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1774 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1775 * 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
|
1776 * 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
|
1777 * 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
|
1778 */ |
7 | 1779 if ( oap->motion_type == MCHAR |
1780 && !oap->is_VIsual | |
50 | 1781 && !oap->block_mode |
7 | 1782 && oap->line_count > 1 |
3254 | 1783 && oap->motion_force == NUL |
7 | 1784 && oap->op_type == OP_DELETE) |
1785 { | |
2957 | 1786 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1787 if (*ptr != NUL) | |
1788 ptr += oap->inclusive; | |
7 | 1789 ptr = skipwhite(ptr); |
1790 if (*ptr == NUL && inindent(0)) | |
1791 oap->motion_type = MLINE; | |
1792 } | |
1793 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1794 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1795 * 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
|
1796 * 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
|
1797 */ |
7 | 1798 if ( oap->motion_type == MCHAR |
1799 && oap->line_count == 1 | |
1800 && oap->op_type == OP_DELETE | |
1801 && *ml_get(oap->start.lnum) == NUL) | |
1802 { | |
1803 /* | |
446 | 1804 * It's an error to operate on an empty region, when 'E' included in |
7 | 1805 * 'cpoptions' (Vi compatible). |
1806 */ | |
446 | 1807 if (virtual_op) |
1808 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1809 * marks as if it happened. */ | |
1810 goto setmarks; | |
7 | 1811 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1812 beep_flush(); | |
1813 return OK; | |
1814 } | |
1815 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1816 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1817 * 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
|
1818 * 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
|
1819 * 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
|
1820 */ |
7 | 1821 if (oap->regname != '_') |
1822 { | |
1823 if (oap->regname != 0) | |
1824 { | |
1825 /* check for read-only register */ | |
1826 if (!valid_yank_reg(oap->regname, TRUE)) | |
1827 { | |
1828 beep_flush(); | |
1829 return OK; | |
1830 } | |
1831 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1832 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1833 did_yank = TRUE; | |
1834 } | |
1835 | |
1836 /* | |
1837 * Put deleted text into register 1 and shift number registers if the | |
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1838 * delete contains a line break, or when using a specific operator (Vi |
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1839 * compatible) |
3782 | 1840 * Use the register name from before adjust_clip_reg() may have |
1841 * changed it. | |
7 | 1842 */ |
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1843 if (oap->motion_type == MLINE || oap->line_count > 1 |
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1844 || oap->use_reg_one) |
7 | 1845 { |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1846 shift_delete_registers(); |
7 | 1847 if (op_yank(oap, TRUE, FALSE) == OK) |
1848 did_yank = TRUE; | |
1849 } | |
1850 | |
3468 | 1851 /* Yank into small delete register when no named register specified |
1852 * and the delete is within one line. */ | |
1853 if (( | |
1854 #ifdef FEAT_CLIPBOARD | |
3584 | 1855 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1856 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1857 #endif |
1858 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1859 && oap->line_count == 1) |
1860 { | |
1861 oap->regname = '-'; | |
1862 get_yank_register(oap->regname, TRUE); | |
1863 if (op_yank(oap, TRUE, FALSE) == OK) | |
1864 did_yank = TRUE; | |
1865 oap->regname = 0; | |
1866 } | |
1867 | |
1868 /* | |
1869 * If there's too much stuff to fit in the yank register, then get a | |
1870 * confirmation before doing the delete. This is crude, but simple. | |
1871 * And it avoids doing a delete of something we can't put back if we | |
1872 * want. | |
1873 */ | |
1874 if (!did_yank) | |
1875 { | |
1876 int msg_silent_save = msg_silent; | |
1877 | |
1878 msg_silent = 0; /* must display the prompt */ | |
1879 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1880 msg_silent = msg_silent_save; | |
1881 if (n != 'y') | |
1882 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1883 emsg(_(e_abort)); |
7 | 1884 return FAIL; |
1885 } | |
1886 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1887 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1888 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1889 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1890 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
|
1891 #endif |
7 | 1892 } |
1893 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1894 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1895 * 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
|
1896 */ |
7 | 1897 if (oap->block_mode) |
1898 { | |
1899 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1900 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1901 return FAIL; | |
1902 | |
1903 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1904 { | |
1905 block_prep(oap, &bd, lnum, TRUE); | |
1906 if (bd.textlen == 0) /* nothing to delete */ | |
1907 continue; | |
1908 | |
1909 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1910 if (lnum == curwin->w_cursor.lnum) | |
1911 { | |
1912 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1913 curwin->w_cursor.coladd = 0; | |
1914 } | |
1915 | |
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1916 // "n" == number of chars deleted |
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1917 // If we delete a TAB, it may be replaced by several characters. |
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1918 // Thus the number of characters may increase! |
7 | 1919 n = bd.textlen - bd.startspaces - bd.endspaces; |
1920 oldp = ml_get(lnum); | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
1921 newp = alloc(STRLEN(oldp) + 1 - n); |
7 | 1922 if (newp == NULL) |
1923 continue; | |
1924 /* copy up to deleted part */ | |
1925 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1926 /* insert spaces */ | |
6929 | 1927 vim_memset(newp + bd.textcol, ' ', |
7 | 1928 (size_t)(bd.startspaces + bd.endspaces)); |
1929 /* copy the part after the deleted part */ | |
1930 oldp += bd.textcol + bd.textlen; | |
1622 | 1931 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1932 /* replace the line */ |
1933 ml_replace(lnum, newp, FALSE); | |
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1934 |
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1935 #ifdef FEAT_TEXT_PROP |
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1936 if (curbuf->b_has_textprop && n != 0) |
16714
ba592f30c082
patch 8.1.1359: text property wrong after :substitute with backslash
Bram Moolenaar <Bram@vim.org>
parents:
16706
diff
changeset
|
1937 adjust_prop_columns(lnum, bd.textcol, -n, 0); |
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1938 #endif |
7 | 1939 } |
1940 | |
1941 check_cursor_col(); | |
1942 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1943 oap->end.lnum + 1, 0L); | |
1944 oap->line_count = 0; /* no lines deleted */ | |
1945 } | |
5735 | 1946 else if (oap->motion_type == MLINE) |
7 | 1947 { |
1948 if (oap->op_type == OP_CHANGE) | |
1949 { | |
1950 /* Delete the lines except the first one. Temporarily move the | |
1951 * cursor to the next line. Save the current line number, if the | |
1952 * last line is deleted it may be changed. | |
1953 */ | |
1954 if (oap->line_count > 1) | |
1955 { | |
1956 lnum = curwin->w_cursor.lnum; | |
1957 ++curwin->w_cursor.lnum; | |
1958 del_lines((long)(oap->line_count - 1), TRUE); | |
1959 curwin->w_cursor.lnum = lnum; | |
1960 } | |
1961 if (u_save_cursor() == FAIL) | |
1962 return FAIL; | |
1963 if (curbuf->b_p_ai) /* don't delete indent */ | |
1964 { | |
1965 beginline(BL_WHITE); /* cursor on first non-white */ | |
1966 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1967 ai_col = curwin->w_cursor.col; | |
1968 } | |
1969 else | |
1970 beginline(0); /* cursor in column 0 */ | |
1971 truncate_line(FALSE); /* delete the rest of the line */ | |
1972 /* leave cursor past last char in line */ | |
1973 if (oap->line_count > 1) | |
1974 u_clearline(); /* "U" command not possible after "2cc" */ | |
1975 } | |
1976 else | |
1977 { | |
1978 del_lines(oap->line_count, TRUE); | |
1979 beginline(BL_WHITE | BL_FIX); | |
1980 u_clearline(); /* "U" command not possible after "dd" */ | |
1981 } | |
1982 } | |
1983 else | |
1984 { | |
1985 if (virtual_op) | |
1986 { | |
1987 int endcol = 0; | |
1988 | |
1989 /* For virtualedit: break the tabs that are partly included. */ | |
1990 if (gchar_pos(&oap->start) == '\t') | |
1991 { | |
1992 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1993 return FAIL; | |
1994 if (oap->line_count == 1) | |
1995 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1996 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1997 oap->start = curwin->w_cursor; | |
1998 if (oap->line_count == 1) | |
1999 { | |
2000 coladvance(endcol); | |
2001 oap->end.col = curwin->w_cursor.col; | |
2002 oap->end.coladd = curwin->w_cursor.coladd; | |
2003 curwin->w_cursor = oap->start; | |
2004 } | |
2005 } | |
2006 | |
2007 /* Break a tab only when it's included in the area. */ | |
2008 if (gchar_pos(&oap->end) == '\t' | |
2009 && (int)oap->end.coladd < oap->inclusive) | |
2010 { | |
2011 /* save last line for undo */ | |
2012 if (u_save((linenr_T)(oap->end.lnum - 1), | |
2013 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2014 return FAIL; | |
2015 curwin->w_cursor = oap->end; | |
2016 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
2017 oap->end = curwin->w_cursor; | |
2018 curwin->w_cursor = oap->start; | |
2019 } | |
2020 } | |
2021 | |
2022 if (oap->line_count == 1) /* delete characters within one line */ | |
2023 { | |
2024 if (u_save_cursor() == FAIL) /* save line for undo */ | |
2025 return FAIL; | |
2026 | |
2027 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2028 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2029 && oap->op_type == OP_CHANGE |
2030 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2031 && !oap->is_VIsual) |
7 | 2032 display_dollar(oap->end.col - !oap->inclusive); |
2033 | |
2034 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2035 | |
2036 if (virtual_op) | |
2037 { | |
2038 /* fix up things for virtualedit-delete: | |
2039 * break the tabs which are going to get in our way | |
2040 */ | |
2041 char_u *curline = ml_get_curline(); | |
2042 int len = (int)STRLEN(curline); | |
2043 | |
2044 if (oap->end.coladd != 0 | |
2045 && (int)oap->end.col >= len - 1 | |
2046 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2047 n++; | |
2048 /* Delete at least one char (e.g, when on a control char). */ | |
2049 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2050 n = 1; | |
2051 | |
2052 /* When deleted a char in the line, reset coladd. */ | |
2053 if (gchar_cursor() != NUL) | |
2054 curwin->w_cursor.coladd = 0; | |
2055 } | |
6826 | 2056 (void)del_bytes((long)n, !virtual_op, |
2057 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2058 } |
2059 else /* delete characters between lines */ | |
2060 { | |
2061 pos_T curpos; | |
2062 | |
2063 /* save deleted and changed lines for undo */ | |
2064 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2065 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2066 return FAIL; | |
2067 | |
2068 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2069 | |
2070 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2071 ++curwin->w_cursor.lnum; | |
2072 del_lines((long)(oap->line_count - 2), FALSE); | |
2073 | |
6826 | 2074 /* delete from start of line until op_end */ |
2957 | 2075 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2076 curwin->w_cursor.col = 0; |
2077 (void)del_bytes((long)n, !virtual_op, | |
2078 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2079 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2080 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2081 } |
2082 } | |
2083 | |
2084 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2085 | |
446 | 2086 setmarks: |
7 | 2087 if (oap->block_mode) |
2088 { | |
2089 curbuf->b_op_end.lnum = oap->end.lnum; | |
2090 curbuf->b_op_end.col = oap->start.col; | |
2091 } | |
2092 else | |
2093 curbuf->b_op_end = oap->start; | |
2094 curbuf->b_op_start = oap->start; | |
2095 | |
2096 return OK; | |
2097 } | |
2098 | |
2099 /* | |
2100 * Adjust end of operating area for ending on a multi-byte character. | |
2101 * Used for deletion. | |
2102 */ | |
2103 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2104 mb_adjust_opend(oparg_T *oap) |
7 | 2105 { |
2106 char_u *p; | |
2107 | |
2108 if (oap->inclusive) | |
2109 { | |
2110 p = ml_get(oap->end.lnum); | |
2111 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2112 } | |
2113 } | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
2114 |
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
|
2115 /* |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2116 * 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
|
2117 * 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
|
2118 */ |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2119 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
|
2120 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
|
2121 { |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2122 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
|
2123 |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2124 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
|
2125 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
|
2126 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
|
2127 /* 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
|
2128 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
|
2129 } |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2130 |
7 | 2131 /* |
2132 * Replace a whole area with one character. | |
2133 */ | |
2134 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2135 op_replace(oparg_T *oap, int c) |
7 | 2136 { |
2137 int n, numc; | |
2138 int num_chars; | |
2139 char_u *newp, *oldp; | |
2140 size_t oldlen; | |
2141 struct block_def bd; | |
5428 | 2142 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
|
2143 int had_ctrl_v_cr = FALSE; |
7 | 2144 |
2145 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2146 return OK; /* nothing to do */ | |
2147 | |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2148 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
|
2149 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2150 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
|
2151 c = CAR; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2152 } |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2153 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
|
2154 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2155 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
|
2156 c = NL; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2157 } |
5428 | 2158 |
7 | 2159 if (has_mbyte) |
2160 mb_adjust_opend(oap); | |
2161 | |
2162 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2163 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2164 return FAIL; | |
2165 | |
2166 /* | |
2167 * block mode replace | |
2168 */ | |
2169 if (oap->block_mode) | |
2170 { | |
2171 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2172 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2173 { | |
1982 | 2174 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2175 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2176 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2177 continue; /* nothing to replace */ | |
2178 | |
2179 /* n == number of extra chars required | |
2180 * If we split a TAB, it may be replaced by several characters. | |
2181 * Thus the number of characters may increase! | |
2182 */ | |
2183 /* If the range starts in virtual space, count the initial | |
2184 * coladd offset as part of "startspaces" */ | |
2185 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2186 { | |
2187 pos_T vpos; | |
2188 | |
1982 | 2189 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2190 getvpos(&vpos, oap->start_vcol); |
2191 bd.startspaces += vpos.coladd; | |
2192 n = bd.startspaces; | |
2193 } | |
2194 else | |
2195 /* allow for pre spaces */ | |
2196 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2197 | |
2198 /* allow for post spp */ | |
2199 n += (bd.endspaces | |
2200 && !bd.is_oneChar | |
2201 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2202 /* Figure out how many characters to replace. */ | |
2203 numc = oap->end_vcol - oap->start_vcol + 1; | |
2204 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2205 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2206 | |
2207 /* A double-wide character can be replaced only up to half the | |
2208 * times. */ | |
2209 if ((*mb_char2cells)(c) > 1) | |
2210 { | |
2211 if ((numc & 1) && !bd.is_short) | |
2212 { | |
2213 ++bd.endspaces; | |
2214 ++n; | |
2215 } | |
2216 numc = numc / 2; | |
2217 } | |
2218 | |
2219 /* Compute bytes needed, move character count to num_chars. */ | |
2220 num_chars = numc; | |
2221 numc *= (*mb_char2len)(c); | |
2222 /* oldlen includes textlen, so don't double count */ | |
2223 n += numc - bd.textlen; | |
2224 | |
2225 oldp = ml_get_curline(); | |
2226 oldlen = STRLEN(oldp); | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2227 newp = alloc(oldlen + 1 + n); |
7 | 2228 if (newp == NULL) |
2229 continue; | |
2230 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2231 /* copy up to deleted part */ | |
2232 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2233 oldp += bd.textcol + bd.textlen; | |
2234 /* insert pre-spaces */ | |
6929 | 2235 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2236 /* 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
|
2237 /* 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
|
2238 * literally. */ |
5428 | 2239 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
7 | 2240 { |
5428 | 2241 if (has_mbyte) |
2242 { | |
2243 n = (int)STRLEN(newp); | |
2244 while (--num_chars >= 0) | |
2245 n += (*mb_char2bytes)(c, newp + n); | |
2246 } | |
2247 else | |
6929 | 2248 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2249 if (!bd.is_short) |
2250 { | |
2251 /* insert post-spaces */ | |
6929 | 2252 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2253 /* copy the part after the changed part */ |
2254 STRMOVE(newp + STRLEN(newp), oldp); | |
2255 } | |
7 | 2256 } |
2257 else | |
2258 { | |
5428 | 2259 /* Replacing with \r or \n means splitting the line. */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2260 after_p = alloc(oldlen + 1 + n - STRLEN(newp)); |
5428 | 2261 if (after_p != NULL) |
2262 STRMOVE(after_p, oldp); | |
7 | 2263 } |
2264 /* replace the line */ | |
2265 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2266 if (after_p != NULL) |
2267 { | |
2268 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2269 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2270 oap->end.lnum++; | |
2271 vim_free(after_p); | |
2272 } | |
7 | 2273 } |
2274 } | |
2275 else | |
2276 { | |
2277 /* | |
2278 * MCHAR and MLINE motion replace. | |
2279 */ | |
2280 if (oap->motion_type == MLINE) | |
2281 { | |
2282 oap->start.col = 0; | |
2283 curwin->w_cursor.col = 0; | |
2284 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2285 if (oap->end.col) | |
2286 --oap->end.col; | |
2287 } | |
2288 else if (!oap->inclusive) | |
2289 dec(&(oap->end)); | |
2290 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2291 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2292 { |
2293 n = gchar_cursor(); | |
2294 if (n != NUL) | |
2295 { | |
2296 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2297 { | |
2298 /* This is slow, but it handles replacing a single-byte | |
2299 * with a multi-byte and the other way around. */ | |
4203 | 2300 if (curwin->w_cursor.lnum == oap->end.lnum) |
2301 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2302 replace_character(c); |
7 | 2303 } |
2304 else | |
2305 { | |
2306 if (n == TAB) | |
2307 { | |
2308 int end_vcol = 0; | |
2309 | |
2310 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2311 { | |
2312 /* oap->end has to be recalculated when | |
2313 * the tab breaks */ | |
2314 end_vcol = getviscol2(oap->end.col, | |
2315 oap->end.coladd); | |
2316 } | |
2317 coladvance_force(getviscol()); | |
2318 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2319 getvpos(&oap->end, end_vcol); | |
2320 } | |
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2321 PBYTE(curwin->w_cursor, c); |
7 | 2322 } |
2323 } | |
2324 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2325 { | |
2326 int virtcols = oap->end.coladd; | |
2327 | |
2328 if (curwin->w_cursor.lnum == oap->start.lnum | |
2329 && oap->start.col == oap->end.col && oap->start.coladd) | |
2330 virtcols -= oap->start.coladd; | |
2331 | |
2332 /* oap->end has been trimmed so it's effectively inclusive; | |
2333 * as a result an extra +1 must be counted so we don't | |
2334 * trample the NUL byte. */ | |
2335 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2336 curwin->w_cursor.col -= (virtcols + 1); | |
2337 for (; virtcols >= 0; virtcols--) | |
2338 { | |
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2339 if ((*mb_char2len)(c) > 1) |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2340 replace_character(c); |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2341 else |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2342 PBYTE(curwin->w_cursor, c); |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2343 if (inc(&curwin->w_cursor) == -1) |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2344 break; |
7 | 2345 } |
2346 } | |
2347 | |
2348 /* Advance to next character, stop at the end of the file. */ | |
2349 if (inc_cursor() == -1) | |
2350 break; | |
2351 } | |
2352 } | |
2353 | |
2354 curwin->w_cursor = oap->start; | |
2355 check_cursor(); | |
2356 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2357 | |
2358 /* Set "'[" and "']" marks. */ | |
2359 curbuf->b_op_start = oap->start; | |
2360 curbuf->b_op_end = oap->end; | |
2361 | |
2362 return OK; | |
2363 } | |
2364 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2365 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2366 |
7 | 2367 /* |
2368 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2369 */ | |
2370 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2371 op_tilde(oparg_T *oap) |
7 | 2372 { |
2373 pos_T pos; | |
2374 struct block_def bd; | |
1528 | 2375 int did_change = FALSE; |
7 | 2376 |
2377 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2378 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2379 return; | |
2380 | |
2381 pos = oap->start; | |
2382 if (oap->block_mode) /* Visual block mode */ | |
2383 { | |
2384 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2385 { | |
1766 | 2386 int one_change; |
2387 | |
7 | 2388 block_prep(oap, &bd, pos.lnum, FALSE); |
2389 pos.col = bd.textcol; | |
1766 | 2390 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2391 did_change |= one_change; | |
1525 | 2392 |
5735 | 2393 #ifdef FEAT_NETBEANS_INTG |
2210 | 2394 if (netbeans_active() && one_change) |
7 | 2395 { |
2396 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2397 | |
33 | 2398 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2399 (long)bd.textlen); | |
7 | 2400 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2401 &ptr[bd.textcol], bd.textlen); |
7 | 2402 } |
5735 | 2403 #endif |
7 | 2404 } |
2405 if (did_change) | |
2406 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2407 } | |
2408 else /* not block mode */ | |
2409 { | |
2410 if (oap->motion_type == MLINE) | |
2411 { | |
2412 oap->start.col = 0; | |
2413 pos.col = 0; | |
2414 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2415 if (oap->end.col) | |
2416 --oap->end.col; | |
2417 } | |
2418 else if (!oap->inclusive) | |
2419 dec(&(oap->end)); | |
2420 | |
1528 | 2421 if (pos.lnum == oap->end.lnum) |
2422 did_change = swapchars(oap->op_type, &pos, | |
2423 oap->end.col - pos.col + 1); | |
2424 else | |
2425 for (;;) | |
2426 { | |
2427 did_change |= swapchars(oap->op_type, &pos, | |
2428 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2429 (int)STRLEN(ml_get_pos(&pos))); | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2430 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2431 break; |
2432 } | |
7 | 2433 if (did_change) |
2434 { | |
2435 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2436 0L); | |
2437 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2438 if (netbeans_active() && did_change) |
7 | 2439 { |
2440 char_u *ptr; | |
2441 int count; | |
2442 | |
2443 pos = oap->start; | |
2444 while (pos.lnum < oap->end.lnum) | |
2445 { | |
2446 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2447 count = (int)STRLEN(ptr) - pos.col; |
33 | 2448 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2449 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2450 &ptr[pos.col], count); |
7 | 2451 pos.col = 0; |
2452 pos.lnum++; | |
2453 } | |
2454 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2455 count = oap->end.col - pos.col + 1; | |
33 | 2456 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2457 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2458 &ptr[pos.col], count); |
7 | 2459 } |
2460 #endif | |
2461 } | |
2462 } | |
2463 | |
2464 if (!did_change && oap->is_VIsual) | |
2465 /* No change: need to remove the Visual selection */ | |
2466 redraw_curbuf_later(INVERTED); | |
2467 | |
2468 /* | |
2469 * Set '[ and '] marks. | |
2470 */ | |
2471 curbuf->b_op_start = oap->start; | |
2472 curbuf->b_op_end = oap->end; | |
2473 | |
2474 if (oap->line_count > p_report) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2475 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
2476 oap->line_count), oap->line_count); |
7 | 2477 } |
2478 | |
2479 /* | |
1525 | 2480 * Invoke swapchar() on "length" bytes at position "pos". |
2481 * "pos" is advanced to just after the changed characters. | |
2482 * "length" is rounded up to include the whole last multi-byte character. | |
2483 * Also works correctly when the number of bytes changes. | |
2484 * Returns TRUE if some character was changed. | |
2485 */ | |
2486 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2487 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2488 { |
2489 int todo; | |
2490 int did_change = 0; | |
2491 | |
2492 for (todo = length; todo > 0; --todo) | |
2493 { | |
2494 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2495 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2496 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2497 |
1525 | 2498 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2499 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2500 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2501 } |
1525 | 2502 did_change |= swapchar(op_type, pos); |
2503 if (inc(pos) == -1) /* at end of file */ | |
2504 break; | |
2505 } | |
2506 return did_change; | |
2507 } | |
2508 | |
2509 /* | |
7 | 2510 * If op_type == OP_UPPER: make uppercase, |
2511 * if op_type == OP_LOWER: make lowercase, | |
2512 * if op_type == OP_ROT13: do rot13 encoding, | |
2513 * else swap case of character at 'pos' | |
2514 * returns TRUE when something actually changed. | |
2515 */ | |
2516 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2517 swapchar(int op_type, pos_T *pos) |
7 | 2518 { |
2519 int c; | |
2520 int nc; | |
2521 | |
2522 c = gchar_pos(pos); | |
2523 | |
2524 /* Only do rot13 encoding for ASCII characters. */ | |
2525 if (c >= 0x80 && op_type == OP_ROT13) | |
2526 return FALSE; | |
2527 | |
1525 | 2528 if (op_type == OP_UPPER && c == 0xdf |
2529 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2530 { |
2531 pos_T sp = curwin->w_cursor; | |
2532 | |
2533 /* Special handling of German sharp s: change to "SS". */ | |
2534 curwin->w_cursor = *pos; | |
2535 del_char(FALSE); | |
2536 ins_char('S'); | |
2537 ins_char('S'); | |
2538 curwin->w_cursor = sp; | |
2539 inc(pos); | |
2540 } | |
2541 | |
7 | 2542 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2543 return FALSE; | |
2544 nc = c; | |
2545 if (MB_ISLOWER(c)) | |
2546 { | |
2547 if (op_type == OP_ROT13) | |
2548 nc = ROT13(c, 'a'); | |
2549 else if (op_type != OP_LOWER) | |
2550 nc = MB_TOUPPER(c); | |
2551 } | |
2552 else if (MB_ISUPPER(c)) | |
2553 { | |
2554 if (op_type == OP_ROT13) | |
2555 nc = ROT13(c, 'A'); | |
2556 else if (op_type != OP_UPPER) | |
2557 nc = MB_TOLOWER(c); | |
2558 } | |
2559 if (nc != c) | |
2560 { | |
2561 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2562 { | |
2563 pos_T sp = curwin->w_cursor; | |
2564 | |
2565 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2566 /* don't use del_char(), it also removes composing chars */ |
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2567 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2568 ins_char(nc); |
2569 curwin->w_cursor = sp; | |
2570 } | |
2571 else | |
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2572 PBYTE(*pos, nc); |
7 | 2573 return TRUE; |
2574 } | |
2575 return FALSE; | |
2576 } | |
2577 | |
2578 /* | |
2579 * op_insert - Insert and append operators for Visual mode. | |
2580 */ | |
2581 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2582 op_insert(oparg_T *oap, long count1) |
7 | 2583 { |
2584 long ins_len, pre_textlen = 0; | |
2585 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2586 colnr_T ind_pre = 0, ind_post; |
7 | 2587 struct block_def bd; |
2588 int i; | |
6579 | 2589 pos_T t1; |
7 | 2590 |
2591 /* edit() changes this - record it for OP_APPEND */ | |
2592 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2593 | |
2594 /* vis block is still marked. Get rid of it now. */ | |
2595 curwin->w_cursor.lnum = oap->start.lnum; | |
2596 update_screen(INVERTED); | |
2597 | |
2598 if (oap->block_mode) | |
2599 { | |
2600 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2601 * doing block_prep(). When only "block" is used, virtual edit is | |
2602 * already disabled, but still need it when calling | |
2603 * coladvance_force(). */ | |
2604 if (curwin->w_cursor.coladd > 0) | |
2605 { | |
2606 int old_ve_flags = ve_flags; | |
2607 | |
2608 ve_flags = VE_ALL; | |
2609 if (u_save_cursor() == FAIL) | |
2610 return; | |
2611 coladvance_force(oap->op_type == OP_APPEND | |
2612 ? oap->end_vcol + 1 : getviscol()); | |
2613 if (oap->op_type == OP_APPEND) | |
2614 --curwin->w_cursor.col; | |
2615 ve_flags = old_ve_flags; | |
2616 } | |
2617 /* Get the info about the block before entering the text */ | |
2618 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2619 /* Get indent information */ |
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2620 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2621 firstline = ml_get(oap->start.lnum) + bd.textcol; |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2622 |
7 | 2623 if (oap->op_type == OP_APPEND) |
2624 firstline += bd.textlen; | |
2625 pre_textlen = (long)STRLEN(firstline); | |
2626 } | |
2627 | |
2628 if (oap->op_type == OP_APPEND) | |
2629 { | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2630 if (oap->block_mode && curwin->w_cursor.coladd == 0) |
7 | 2631 { |
2632 /* Move the cursor to the character right of the block. */ | |
2633 curwin->w_set_curswant = TRUE; | |
2634 while (*ml_get_cursor() != NUL | |
2635 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2636 ++curwin->w_cursor.col; | |
2637 if (bd.is_short && !bd.is_MAX) | |
2638 { | |
2639 /* First line was too short, make it longer and adjust the | |
2640 * values in "bd". */ | |
2641 if (u_save_cursor() == FAIL) | |
2642 return; | |
2643 for (i = 0; i < bd.endspaces; ++i) | |
2644 ins_char(' '); | |
2645 bd.textlen += bd.endspaces; | |
2646 } | |
2647 } | |
2648 else | |
2649 { | |
2650 curwin->w_cursor = oap->end; | |
893 | 2651 check_cursor_col(); |
7 | 2652 |
2653 /* Works just like an 'i'nsert on the next character. */ | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2654 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2655 && oap->start_vcol != oap->end_vcol) |
2656 inc_cursor(); | |
2657 } | |
2658 } | |
2659 | |
6579 | 2660 t1 = oap->start; |
10803
065da86ca6d2
patch 8.0.0291: Visual block insertion does not insert in all lines
Christian Brabandt <cb@256bit.org>
parents:
10785
diff
changeset
|
2661 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2662 |
6579 | 2663 /* When a tab was inserted, and the characters in front of the tab |
2664 * have been converted to a tab as well, the column of the cursor | |
2665 * might have actually been reduced, so need to adjust here. */ | |
2666 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2667 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2668 oap->start = curbuf->b_op_start_orig; |
2669 | |
1477 | 2670 /* If user has moved off this line, we don't know what to do, so do |
2671 * nothing. | |
2672 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2673 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2674 return; |
2675 | |
2676 if (oap->block_mode) | |
2677 { | |
2678 struct block_def bd2; | |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2679 int did_indent = FALSE; |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2680 size_t len; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2681 int add; |
7 | 2682 |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2683 /* If indent kicked in, the firstline might have changed |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2684 * but only do that, if the indent actually increased. */ |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2685 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2686 if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2687 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2688 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2689 bd.start_vcol += ind_post - ind_pre; |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2690 did_indent = TRUE; |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2691 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2692 |
5471 | 2693 /* The user may have moved the cursor before inserting something, try |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2694 * to adjust the block for that. But only do it, if the difference |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2695 * does not come from indent kicking in. */ |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2696 if (oap->start.lnum == curbuf->b_op_start_orig.lnum |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2697 && !bd.is_MAX && !did_indent) |
5471 | 2698 { |
2699 if (oap->op_type == OP_INSERT | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2700 && oap->start.col + oap->start.coladd |
5730 | 2701 != curbuf->b_op_start_orig.col |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2702 + curbuf->b_op_start_orig.coladd) |
5471 | 2703 { |
6579 | 2704 int t = getviscol2(curbuf->b_op_start_orig.col, |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2705 curbuf->b_op_start_orig.coladd); |
5680 | 2706 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2707 pre_textlen -= t - oap->start_vcol; |
2708 oap->start_vcol = t; | |
5471 | 2709 } |
2710 else if (oap->op_type == OP_APPEND | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2711 && oap->end.col + oap->end.coladd |
5730 | 2712 >= curbuf->b_op_start_orig.col |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2713 + curbuf->b_op_start_orig.coladd) |
5471 | 2714 { |
6579 | 2715 int t = getviscol2(curbuf->b_op_start_orig.col, |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2716 curbuf->b_op_start_orig.coladd); |
5680 | 2717 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2718 /* reset pre_textlen to the value of OP_INSERT */ |
2719 pre_textlen += bd.textlen; | |
6579 | 2720 pre_textlen -= t - oap->start_vcol; |
2721 oap->start_vcol = t; | |
5471 | 2722 oap->op_type = OP_INSERT; |
2723 } | |
2724 } | |
2725 | |
7 | 2726 /* |
2727 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2728 * tabs. Get the starting column again and correct the length. |
7 | 2729 * Don't do this when "$" used, end-of-line will have changed. |
2730 */ | |
2731 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2732 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2733 { | |
2734 if (oap->op_type == OP_APPEND) | |
2735 { | |
2736 pre_textlen += bd2.textlen - bd.textlen; | |
2737 if (bd2.endspaces) | |
2738 --bd2.textlen; | |
2739 } | |
2740 bd.textcol = bd2.textcol; | |
2741 bd.textlen = bd2.textlen; | |
2742 } | |
2743 | |
2744 /* | |
2745 * Subsequent calls to ml_get() flush the firstline data - take a | |
2746 * copy of the required string. | |
2747 */ | |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2748 firstline = ml_get(oap->start.lnum); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2749 len = STRLEN(firstline); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2750 add = bd.textcol; |
7 | 2751 if (oap->op_type == OP_APPEND) |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2752 add += bd.textlen; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2753 if ((size_t)add > len) |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2754 firstline += len; // short line, point to the NUL |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2755 else |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2756 firstline += add; |
3421 | 2757 if (pre_textlen >= 0 |
2758 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2759 { |
2760 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2761 if (ins_text != NULL) | |
2762 { | |
2763 /* block handled here */ | |
2764 if (u_save(oap->start.lnum, | |
2765 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2766 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2767 &bd); | |
2768 | |
2769 curwin->w_cursor.col = oap->start.col; | |
2770 check_cursor(); | |
2771 vim_free(ins_text); | |
2772 } | |
2773 } | |
2774 } | |
2775 } | |
2776 | |
2777 /* | |
2778 * op_change - handle a change operation | |
2779 * | |
2780 * return TRUE if edit() returns because of a CTRL-O command | |
2781 */ | |
2782 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2783 op_change(oparg_T *oap) |
7 | 2784 { |
2785 colnr_T l; | |
2786 int retval; | |
2787 long offset; | |
2788 linenr_T linenr; | |
1392 | 2789 long ins_len; |
2790 long pre_textlen = 0; | |
2791 long pre_indent = 0; | |
7 | 2792 char_u *firstline; |
2793 char_u *ins_text, *newp, *oldp; | |
2794 struct block_def bd; | |
2795 | |
2796 l = oap->start.col; | |
2797 if (oap->motion_type == MLINE) | |
2798 { | |
2799 l = 0; | |
2800 #ifdef FEAT_SMARTINDENT | |
2801 if (!p_paste && curbuf->b_p_si | |
2802 # ifdef FEAT_CINDENT | |
2803 && !curbuf->b_p_cin | |
2804 # endif | |
2805 ) | |
2806 can_si = TRUE; /* It's like opening a new line, do si */ | |
2807 #endif | |
2808 } | |
2809 | |
2810 /* First delete the text in the region. In an empty buffer only need to | |
2811 * save for undo */ | |
2812 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2813 { | |
2814 if (u_save_cursor() == FAIL) | |
2815 return FALSE; | |
2816 } | |
2817 else if (op_delete(oap) == FAIL) | |
2818 return FALSE; | |
2819 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2820 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2821 && !virtual_op) |
2822 inc_cursor(); | |
2823 | |
2824 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2825 /* skip blank lines too */ | |
2826 if (oap->block_mode) | |
2827 { | |
2828 /* Add spaces before getting the current line length. */ | |
2829 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2830 || gchar_cursor() == NUL)) | |
2831 coladvance_force(getviscol()); | |
1392 | 2832 firstline = ml_get(oap->start.lnum); |
2833 pre_textlen = (long)STRLEN(firstline); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2834 pre_indent = (long)getwhitecols(firstline); |
7 | 2835 bd.textcol = curwin->w_cursor.col; |
2836 } | |
2837 | |
2838 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2839 if (oap->motion_type == MLINE) | |
2840 fix_indent(); | |
2841 #endif | |
2842 | |
2843 retval = edit(NUL, FALSE, (linenr_T)1); | |
2844 | |
2845 /* | |
39 | 2846 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2847 * block. |
1477 | 2848 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2849 */ |
1477 | 2850 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2851 { |
1392 | 2852 /* Auto-indenting may have changed the indent. If the cursor was past |
2853 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2854 firstline = ml_get(oap->start.lnum); |
1403 | 2855 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2856 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2857 long new_indent = (long)getwhitecols(firstline); |
1392 | 2858 |
2859 pre_textlen += new_indent - pre_indent; | |
2860 bd.textcol += new_indent - pre_indent; | |
2861 } | |
2862 | |
2863 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2864 if (ins_len > 0) | |
2865 { | |
2866 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2867 * copy of the inserted text. */ | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2868 if ((ins_text = alloc(ins_len + 1)) != NULL) |
7 | 2869 { |
419 | 2870 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2871 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2872 linenr++) | |
2873 { | |
2874 block_prep(oap, &bd, linenr, TRUE); | |
2875 if (!bd.is_short || virtual_op) | |
2876 { | |
2877 pos_T vpos; | |
2878 | |
2879 /* If the block starts in virtual space, count the | |
2880 * initial coladd offset as part of "startspaces" */ | |
2881 if (bd.is_short) | |
2882 { | |
1982 | 2883 vpos.lnum = linenr; |
7 | 2884 (void)getvpos(&vpos, oap->start_vcol); |
2885 } | |
2886 else | |
2887 vpos.coladd = 0; | |
2888 oldp = ml_get(linenr); | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
2889 newp = alloc(STRLEN(oldp) + vpos.coladd + ins_len + 1); |
7 | 2890 if (newp == NULL) |
2891 continue; | |
2892 /* copy up to block start */ | |
2893 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2894 offset = bd.textcol; | |
6929 | 2895 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2896 offset += vpos.coladd; |
2897 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2898 offset += ins_len; | |
2899 oldp += bd.textcol; | |
1622 | 2900 STRMOVE(newp + offset, oldp); |
7 | 2901 ml_replace(linenr, newp, FALSE); |
2902 } | |
2903 } | |
2904 check_cursor(); | |
2905 | |
2906 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2907 } | |
2908 vim_free(ins_text); | |
2909 } | |
2910 } | |
2911 | |
2912 return retval; | |
2913 } | |
2914 | |
2915 /* | |
2916 * set all the yank registers to empty (called from main()) | |
2917 */ | |
2918 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2919 init_yank(void) |
7 | 2920 { |
2921 int i; | |
2922 | |
2923 for (i = 0; i < NUM_REGISTERS; ++i) | |
2924 y_regs[i].y_array = NULL; | |
2925 } | |
2926 | |
356 | 2927 #if defined(EXITFREE) || defined(PROTO) |
2928 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2929 clear_registers(void) |
356 | 2930 { |
2931 int i; | |
2932 | |
2933 for (i = 0; i < NUM_REGISTERS; ++i) | |
2934 { | |
2935 y_current = &y_regs[i]; | |
2936 if (y_current->y_array != NULL) | |
2937 free_yank_all(); | |
2938 } | |
2939 } | |
2940 #endif | |
2941 | |
7 | 2942 /* |
2943 * Free "n" lines from the current yank register. | |
2944 * Called for normal freeing and in case of error. | |
2945 */ | |
2946 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2947 free_yank(long n) |
7 | 2948 { |
2949 if (y_current->y_array != NULL) | |
2950 { | |
2951 long i; | |
2952 | |
2953 for (i = n; --i >= 0; ) | |
2954 { | |
2955 #ifdef AMIGA /* only for very slow machines */ | |
2956 if ((i & 1023) == 1023) /* this may take a while */ | |
2957 { | |
2958 /* | |
2959 * This message should never cause a hit-return message. | |
2960 * Overwrite this message with any next message. | |
2961 */ | |
2962 ++no_wait_return; | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2963 smsg(_("freeing %ld lines"), i + 1); |
7 | 2964 --no_wait_return; |
2965 msg_didout = FALSE; | |
2966 msg_col = 0; | |
2967 } | |
2968 #endif | |
2969 vim_free(y_current->y_array[i]); | |
2970 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
2971 VIM_CLEAR(y_current->y_array); |
7 | 2972 #ifdef AMIGA |
2973 if (n >= 1000) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
2974 msg(""); |
7 | 2975 #endif |
2976 } | |
2977 } | |
2978 | |
2979 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2980 free_yank_all(void) |
7 | 2981 { |
2982 free_yank(y_current->y_size); | |
2983 } | |
2984 | |
2985 /* | |
2986 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2987 * If we are to append (uppercase register), we first yank into a new yank | |
2988 * register and then concatenate the old and the new one (so we keep the old | |
2989 * one in case of out-of-memory). | |
2990 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2991 * Return FAIL for failure, OK otherwise. |
7 | 2992 */ |
2993 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2994 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 2995 { |
2996 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
|
2997 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
|
2998 yankreg_T newreg; /* new yank register when appending */ |
7 | 2999 char_u **new_ptr; |
3000 linenr_T lnum; /* current line number */ | |
3001 long j; | |
3002 int yanktype = oap->motion_type; | |
3003 long yanklines = oap->line_count; | |
3004 linenr_T yankendlnum = oap->end.lnum; | |
3005 char_u *p; | |
3006 char_u *pnew; | |
3007 struct block_def bd; | |
2658 | 3008 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3009 int did_star = FALSE; |
2658 | 3010 #endif |
7 | 3011 |
3012 /* check for read-only register */ | |
3013 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3014 { | |
3015 beep_flush(); | |
3016 return FAIL; | |
3017 } | |
3018 if (oap->regname == '_') /* black hole: nothing to do */ | |
3019 return OK; | |
3020 | |
3021 #ifdef FEAT_CLIPBOARD | |
3022 if (!clip_star.available && oap->regname == '*') | |
3023 oap->regname = 0; | |
3024 else if (!clip_plus.available && oap->regname == '+') | |
3025 oap->regname = 0; | |
3026 #endif | |
3027 | |
3028 if (!deleting) /* op_delete() already set y_current */ | |
3029 get_yank_register(oap->regname, TRUE); | |
3030 | |
3031 curr = y_current; | |
3032 /* append to existing contents */ | |
3033 if (y_append && y_current->y_array != NULL) | |
3034 y_current = &newreg; | |
3035 else | |
3036 free_yank_all(); /* free previously yanked lines */ | |
3037 | |
593 | 3038 /* |
3039 * If the cursor was in column 1 before and after the movement, and the | |
3040 * operator is not inclusive, the yank is always linewise. | |
3041 */ | |
7 | 3042 if ( oap->motion_type == MCHAR |
3043 && oap->start.col == 0 | |
3044 && !oap->inclusive | |
3045 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3046 && !oap->block_mode |
7 | 3047 && oap->end.col == 0 |
3048 && yanklines > 1) | |
3049 { | |
3050 yanktype = MLINE; | |
3051 --yankendlnum; | |
3052 --yanklines; | |
3053 } | |
3054 | |
3055 y_current->y_size = yanklines; | |
3056 y_current->y_type = yanktype; /* set the yank register type */ | |
3057 y_current->y_width = 0; | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3058 y_current->y_array = lalloc_clear(sizeof(char_u *) * yanklines, TRUE); |
7 | 3059 if (y_current->y_array == NULL) |
3060 { | |
3061 y_current = curr; | |
3062 return FAIL; | |
3063 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3064 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3065 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
|
3066 #endif |
7 | 3067 |
3068 y_idx = 0; | |
3069 lnum = oap->start.lnum; | |
3070 | |
3071 if (oap->block_mode) | |
3072 { | |
3073 /* Visual block mode */ | |
3074 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3075 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3076 | |
3077 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3078 y_current->y_width--; | |
3079 } | |
3080 | |
3081 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3082 { | |
3083 switch (y_current->y_type) | |
3084 { | |
3085 case MBLOCK: | |
3086 block_prep(oap, &bd, lnum, FALSE); | |
3087 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3088 goto fail; | |
3089 break; | |
3090 | |
3091 case MLINE: | |
3092 if ((y_current->y_array[y_idx] = | |
3093 vim_strsave(ml_get(lnum))) == NULL) | |
3094 goto fail; | |
3095 break; | |
3096 | |
3097 case MCHAR: | |
3098 { | |
3099 colnr_T startcol = 0, endcol = MAXCOL; | |
3100 int is_oneChar = FALSE; | |
3101 colnr_T cs, ce; | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3102 |
7 | 3103 p = ml_get(lnum); |
3104 bd.startspaces = 0; | |
3105 bd.endspaces = 0; | |
3106 | |
3107 if (lnum == oap->start.lnum) | |
3108 { | |
3109 startcol = oap->start.col; | |
3110 if (virtual_op) | |
3111 { | |
3112 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3113 if (ce != cs && oap->start.coladd > 0) | |
3114 { | |
3115 /* Part of a tab selected -- but don't | |
3116 * double-count it. */ | |
3117 bd.startspaces = (ce - cs + 1) | |
3118 - oap->start.coladd; | |
3119 startcol++; | |
3120 } | |
3121 } | |
3122 } | |
3123 | |
3124 if (lnum == oap->end.lnum) | |
3125 { | |
3126 endcol = oap->end.col; | |
3127 if (virtual_op) | |
3128 { | |
3129 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3130 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3131 /* Don't add space for double-wide | |
3132 * char; endcol will be on last byte | |
3133 * of multi-byte char. */ | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3134 && (*mb_head_off)(p, p + endcol) == 0)) |
7 | 3135 { |
3136 if (oap->start.lnum == oap->end.lnum | |
3137 && oap->start.col == oap->end.col) | |
3138 { | |
3139 /* Special case: inside a single char */ | |
3140 is_oneChar = TRUE; | |
3141 bd.startspaces = oap->end.coladd | |
3142 - oap->start.coladd + oap->inclusive; | |
3143 endcol = startcol; | |
3144 } | |
3145 else | |
3146 { | |
3147 bd.endspaces = oap->end.coladd | |
3148 + oap->inclusive; | |
3149 endcol -= oap->inclusive; | |
3150 } | |
3151 } | |
3152 } | |
3153 } | |
3510 | 3154 if (endcol == MAXCOL) |
3155 endcol = (colnr_T)STRLEN(p); | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3156 if (startcol > endcol || is_oneChar) |
7 | 3157 bd.textlen = 0; |
3158 else | |
3159 bd.textlen = endcol - startcol + oap->inclusive; | |
3160 bd.textstart = p + startcol; | |
3161 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3162 goto fail; | |
3163 break; | |
3164 } | |
3165 /* NOTREACHED */ | |
3166 } | |
3167 } | |
3168 | |
3169 if (curr != y_current) /* append the new block to the old block */ | |
3170 { | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3171 new_ptr = ALLOC_MULT(char_u *, curr->y_size + y_current->y_size); |
7 | 3172 if (new_ptr == NULL) |
3173 goto fail; | |
3174 for (j = 0; j < curr->y_size; ++j) | |
3175 new_ptr[j] = curr->y_array[j]; | |
3176 vim_free(curr->y_array); | |
3177 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3178 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3179 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3180 #endif |
7 | 3181 |
3182 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3183 curr->y_type = MLINE; | |
3184 | |
164 | 3185 /* Concatenate the last line of the old block with the first line of |
3186 * the new block, unless being Vi compatible. */ | |
3187 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3188 { |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
3189 pnew = alloc(STRLEN(curr->y_array[curr->y_size - 1]) |
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
3190 + STRLEN(y_current->y_array[0]) + 1); |
7 | 3191 if (pnew == NULL) |
3192 { | |
3193 y_idx = y_current->y_size - 1; | |
3194 goto fail; | |
3195 } | |
3196 STRCPY(pnew, curr->y_array[--j]); | |
3197 STRCAT(pnew, y_current->y_array[0]); | |
3198 vim_free(curr->y_array[j]); | |
3199 vim_free(y_current->y_array[0]); | |
3200 curr->y_array[j++] = pnew; | |
3201 y_idx = 1; | |
3202 } | |
3203 else | |
3204 y_idx = 0; | |
3205 while (y_idx < y_current->y_size) | |
3206 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3207 curr->y_size = j; | |
3208 vim_free(y_current->y_array); | |
3209 y_current = curr; | |
3210 } | |
5981 | 3211 if (curwin->w_p_rnu) |
3212 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3213 if (mess) /* Display message about yank? */ |
3214 { | |
3215 if (yanktype == MCHAR | |
3216 && !oap->block_mode | |
3217 && yanklines == 1) | |
3218 yanklines = 0; | |
3219 /* Some versions of Vi use ">=" here, some don't... */ | |
3220 if (yanklines > p_report) | |
3221 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3222 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
|
3223 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3224 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
|
3225 *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
|
3226 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3227 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
|
3228 _(" 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
|
3229 |
7 | 3230 /* redisplay now, so message is not deleted */ |
3231 update_topline_redraw(); | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3232 if (oap->block_mode) |
205 | 3233 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3234 smsg(NGETTEXT("block of %ld line yanked%s", |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3235 "block of %ld lines yanked%s", yanklines), |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3236 yanklines, namebuf); |
205 | 3237 } |
7 | 3238 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3239 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3240 smsg(NGETTEXT("%ld line yanked%s", |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3241 "%ld lines yanked%s", yanklines), |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3242 yanklines, namebuf); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3243 } |
7 | 3244 } |
3245 } | |
3246 | |
3247 /* | |
3248 * Set "'[" and "']" marks. | |
3249 */ | |
3250 curbuf->b_op_start = oap->start; | |
3251 curbuf->b_op_end = oap->end; | |
5735 | 3252 if (yanktype == MLINE && !oap->block_mode) |
36 | 3253 { |
3254 curbuf->b_op_start.col = 0; | |
3255 curbuf->b_op_end.col = MAXCOL; | |
3256 } | |
7 | 3257 |
3258 #ifdef FEAT_CLIPBOARD | |
3259 /* | |
3260 * If we were yanking to the '*' register, send result to clipboard. | |
3261 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3262 * to the '*' register. | |
3263 */ | |
3264 if (clip_star.available | |
3265 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3266 || (!deleting && oap->regname == 0 |
6116 | 3267 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3268 { |
3269 if (curr != &(y_regs[STAR_REGISTER])) | |
3270 /* Copy the text from register 0 to the clipboard register. */ | |
3271 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3272 | |
3273 clip_own_selection(&clip_star); | |
3274 clip_gen_set_selection(&clip_star); | |
2658 | 3275 # ifdef FEAT_X11 |
2654 | 3276 did_star = TRUE; |
2658 | 3277 # endif |
7 | 3278 } |
3279 | |
3280 # ifdef FEAT_X11 | |
3281 /* | |
3282 * If we were yanking to the '+' register, send result to selection. | |
3283 * Also copy to the '*' register, in case auto-select is off. | |
3284 */ | |
2654 | 3285 if (clip_plus.available |
3286 && (curr == &(y_regs[PLUS_REGISTER]) | |
3287 || (!deleting && oap->regname == 0 | |
6116 | 3288 && ((clip_unnamed | clip_unnamed_saved) & |
3289 CLIP_UNNAMED_PLUS)))) | |
7 | 3290 { |
2654 | 3291 if (curr != &(y_regs[PLUS_REGISTER])) |
3292 /* Copy the text from register 0 to the clipboard register. */ | |
3293 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3294 | |
7 | 3295 clip_own_selection(&clip_plus); |
3296 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
|
3297 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
|
3298 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3299 { |
3300 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3301 clip_own_selection(&clip_star); | |
3302 clip_gen_set_selection(&clip_star); | |
3303 } | |
3304 } | |
3305 # endif | |
3306 #endif | |
3307 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3308 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3309 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3310 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
|
3311 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3312 |
7 | 3313 return OK; |
3314 | |
3315 fail: /* free the allocated lines */ | |
3316 free_yank(y_idx + 1); | |
3317 y_current = curr; | |
3318 return FAIL; | |
3319 } | |
3320 | |
3321 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3322 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3323 { |
3324 char_u *pnew; | |
3325 | |
3326 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3327 == NULL) | |
3328 return FAIL; | |
3329 y_current->y_array[y_idx] = pnew; | |
6929 | 3330 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3331 pnew += bd->startspaces; |
3332 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3333 pnew += bd->textlen; | |
6929 | 3334 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3335 pnew += bd->endspaces; |
3336 *pnew = NUL; | |
3337 return OK; | |
3338 } | |
3339 | |
3340 #ifdef FEAT_CLIPBOARD | |
3341 /* | |
3342 * Make a copy of the y_current register to register "reg". | |
3343 */ | |
3344 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3345 copy_yank_reg(yankreg_T *reg) |
7 | 3346 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3347 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3348 long j; |
7 | 3349 |
3350 y_current = reg; | |
3351 free_yank_all(); | |
3352 *y_current = *curr; | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3353 y_current->y_array = lalloc_clear( |
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3354 sizeof(char_u *) * y_current->y_size, TRUE); |
7 | 3355 if (y_current->y_array == NULL) |
3356 y_current->y_size = 0; | |
3357 else | |
3358 for (j = 0; j < y_current->y_size; ++j) | |
3359 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3360 { | |
3361 free_yank(j); | |
3362 y_current->y_size = 0; | |
3363 break; | |
3364 } | |
3365 y_current = curr; | |
3366 } | |
3367 #endif | |
3368 | |
3369 /* | |
140 | 3370 * Put contents of register "regname" into the text. |
3371 * Caller must check "regname" to be valid! | |
3372 * "flags": PUT_FIXINDENT make indent look nice | |
3373 * PUT_CURSEND leave cursor after end of new text | |
3374 * PUT_LINE force linewise put (":put") | |
7 | 3375 */ |
3376 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3377 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3378 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3379 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
|
3380 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3381 int flags) |
7 | 3382 { |
3383 char_u *ptr; | |
3384 char_u *newp, *oldp; | |
3385 int yanklen; | |
3386 int totlen = 0; /* init for gcc */ | |
3387 linenr_T lnum; | |
3388 colnr_T col; | |
3389 long i; /* index in y_array[] */ | |
3390 int y_type; | |
3391 long y_size; | |
3392 int oldlen; | |
3393 long y_width = 0; | |
3394 colnr_T vcol; | |
3395 int delcount; | |
3396 int incr = 0; | |
3397 long j; | |
3398 struct block_def bd; | |
3399 char_u **y_array = NULL; | |
3400 long nr_lines = 0; | |
3401 pos_T new_cursor; | |
3402 int indent; | |
3403 int orig_indent = 0; /* init for gcc */ | |
3404 int indent_diff = 0; /* init for gcc */ | |
3405 int first_indent = TRUE; | |
3406 int lendiff = 0; | |
3407 pos_T old_pos; | |
3408 char_u *insert_string = NULL; | |
3409 int allocated = FALSE; | |
3410 long cnt; | |
3411 | |
3412 #ifdef FEAT_CLIPBOARD | |
3413 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3414 adjust_clip_reg(®name); | |
3415 (void)may_get_selection(regname); | |
3416 #endif | |
3417 | |
3418 if (flags & PUT_FIXINDENT) | |
3419 orig_indent = get_indent(); | |
3420 | |
3421 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3422 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3423 | |
3424 /* | |
3425 * Using inserted text works differently, because the register includes | |
3426 * special characters (newlines, etc.). | |
3427 */ | |
3428 if (regname == '.') | |
3429 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3430 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3431 stuffcharReadbuff(VIsual_mode); |
7 | 3432 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3433 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3434 /* Putting the text is done later, so can't really move the cursor to | |
3435 * the next character. Use "l" to simulate it. */ | |
3436 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3437 stuffcharReadbuff('l'); | |
3438 return; | |
3439 } | |
3440 | |
3441 /* | |
3442 * For special registers '%' (file name), '#' (alternate file name) and | |
3443 * ':' (last command line), etc. we have to create a fake yank register. | |
3444 */ | |
3445 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3446 { | |
3447 if (insert_string == NULL) | |
3448 return; | |
3449 } | |
3450 | |
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3451 /* 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
|
3452 * 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
|
3453 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
|
3454 goto end; |
4005 | 3455 |
7 | 3456 if (insert_string != NULL) |
3457 { | |
3458 y_type = MCHAR; | |
3459 #ifdef FEAT_EVAL | |
3460 if (regname == '=') | |
3461 { | |
3462 /* For the = register we need to split the string at NL | |
3093 | 3463 * characters. |
3464 * Loop twice: count the number of lines and save them. */ | |
7 | 3465 for (;;) |
3466 { | |
3467 y_size = 0; | |
3468 ptr = insert_string; | |
3469 while (ptr != NULL) | |
3470 { | |
3471 if (y_array != NULL) | |
3472 y_array[y_size] = ptr; | |
3473 ++y_size; | |
3474 ptr = vim_strchr(ptr, '\n'); | |
3475 if (ptr != NULL) | |
3476 { | |
3477 if (y_array != NULL) | |
3478 *ptr = NUL; | |
3479 ++ptr; | |
3093 | 3480 /* A trailing '\n' makes the register linewise. */ |
7 | 3481 if (*ptr == NUL) |
3482 { | |
3483 y_type = MLINE; | |
3484 break; | |
3485 } | |
3486 } | |
3487 } | |
3488 if (y_array != NULL) | |
3489 break; | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3490 y_array = ALLOC_MULT(char_u *, y_size); |
7 | 3491 if (y_array == NULL) |
3492 goto end; | |
3493 } | |
3494 } | |
3495 else | |
3496 #endif | |
3497 { | |
3498 y_size = 1; /* use fake one-line yank register */ | |
3499 y_array = &insert_string; | |
3500 } | |
3501 } | |
3502 else | |
3503 { | |
3504 get_yank_register(regname, FALSE); | |
3505 | |
3506 y_type = y_current->y_type; | |
3507 y_width = y_current->y_width; | |
3508 y_size = y_current->y_size; | |
3509 y_array = y_current->y_array; | |
3510 } | |
3511 | |
3512 if (y_type == MLINE) | |
3513 { | |
3514 if (flags & PUT_LINE_SPLIT) | |
3515 { | |
6845 | 3516 char_u *p; |
3517 | |
7 | 3518 /* "p" or "P" in Visual mode: split the lines to put the text in |
3519 * between. */ | |
3520 if (u_save_cursor() == FAIL) | |
3521 goto end; | |
6845 | 3522 p = ml_get_cursor(); |
3523 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
|
3524 MB_PTR_ADV(p); |
6845 | 3525 ptr = vim_strsave(p); |
7 | 3526 if (ptr == NULL) |
3527 goto end; | |
3528 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3529 vim_free(ptr); | |
3530 | |
6845 | 3531 oldp = ml_get_curline(); |
3532 p = oldp + curwin->w_cursor.col; | |
3533 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
|
3534 MB_PTR_ADV(p); |
6845 | 3535 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3536 if (ptr == NULL) |
3537 goto end; | |
3538 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3539 ++nr_lines; | |
3540 dir = FORWARD; | |
3541 } | |
3542 if (flags & PUT_LINE_FORWARD) | |
3543 { | |
3544 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3545 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3546 dir = FORWARD; |
3547 } | |
3548 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3549 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3550 } | |
3551 | |
3552 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3553 y_type = MLINE; | |
3554 | |
3555 if (y_size == 0 || y_array == NULL) | |
3556 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3557 semsg(_("E353: Nothing in register %s"), |
7 | 3558 regname == 0 ? (char_u *)"\"" : transchar(regname)); |
3559 goto end; | |
3560 } | |
3561 | |
3562 if (y_type == MBLOCK) | |
3563 { | |
3564 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3565 if (lnum > curbuf->b_ml.ml_line_count) | |
3566 lnum = curbuf->b_ml.ml_line_count + 1; | |
3567 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3568 goto end; | |
3569 } | |
5735 | 3570 else if (y_type == MLINE) |
7 | 3571 { |
3572 lnum = curwin->w_cursor.lnum; | |
3573 #ifdef FEAT_FOLDING | |
3574 /* Correct line number for closed fold. Don't move the cursor yet, | |
3575 * u_save() uses it. */ | |
3576 if (dir == BACKWARD) | |
3577 (void)hasFolding(lnum, &lnum, NULL); | |
3578 else | |
3579 (void)hasFolding(lnum, NULL, &lnum); | |
3580 #endif | |
3581 if (dir == FORWARD) | |
3582 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3583 /* 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
|
3584 * 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
|
3585 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3586 goto end; |
3587 #ifdef FEAT_FOLDING | |
3588 if (dir == FORWARD) | |
3589 curwin->w_cursor.lnum = lnum - 1; | |
3590 else | |
3591 curwin->w_cursor.lnum = lnum; | |
3592 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3593 #endif | |
3594 } | |
3595 else if (u_save_cursor() == FAIL) | |
3596 goto end; | |
3597 | |
3598 yanklen = (int)STRLEN(y_array[0]); | |
3599 | |
3600 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3601 { | |
3602 if (gchar_cursor() == TAB) | |
3603 { | |
3604 /* Don't need to insert spaces when "p" on the last position of a | |
3605 * 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
|
3606 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3607 int viscol = getviscol(); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3608 if (dir == FORWARD |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3609 ? 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
|
3610 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
|
3611 : 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
|
3612 coladvance_force(viscol); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3613 #else |
7 | 3614 if (dir == FORWARD |
3615 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3616 : curwin->w_cursor.coladd > 0) | |
3617 coladvance_force(getviscol()); | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3618 #endif |
7 | 3619 else |
3620 curwin->w_cursor.coladd = 0; | |
3621 } | |
3622 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3623 coladvance_force(getviscol() + (dir == FORWARD)); | |
3624 } | |
3625 | |
3626 lnum = curwin->w_cursor.lnum; | |
3627 col = curwin->w_cursor.col; | |
3628 | |
3629 /* | |
3630 * Block mode | |
3631 */ | |
3632 if (y_type == MBLOCK) | |
3633 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3634 int c = gchar_cursor(); |
7 | 3635 colnr_T endcol2 = 0; |
3636 | |
3637 if (dir == FORWARD && c != NUL) | |
3638 { | |
3639 if (ve_flags == VE_ALL) | |
3640 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3641 else | |
3642 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3643 | |
3644 if (has_mbyte) | |
3645 /* move to start of next multi-byte character */ | |
474 | 3646 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3647 else |
3648 if (c != TAB || ve_flags != VE_ALL) | |
3649 ++curwin->w_cursor.col; | |
3650 ++col; | |
3651 } | |
3652 else | |
3653 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3654 | |
3655 col += curwin->w_cursor.coladd; | |
1304 | 3656 if (ve_flags == VE_ALL |
3657 && (curwin->w_cursor.coladd > 0 | |
3658 || endcol2 == curwin->w_cursor.col)) | |
7 | 3659 { |
3660 if (dir == FORWARD && c == NUL) | |
3661 ++col; | |
3662 if (dir != FORWARD && c != NUL) | |
3663 ++curwin->w_cursor.col; | |
3664 if (c == TAB) | |
3665 { | |
3666 if (dir == BACKWARD && curwin->w_cursor.col) | |
3667 curwin->w_cursor.col--; | |
3668 if (dir == FORWARD && col - 1 == endcol2) | |
3669 curwin->w_cursor.col++; | |
3670 } | |
3671 } | |
3672 curwin->w_cursor.coladd = 0; | |
699 | 3673 bd.textcol = 0; |
7 | 3674 for (i = 0; i < y_size; ++i) |
3675 { | |
3676 int spaces; | |
3677 char shortline; | |
3678 | |
3679 bd.startspaces = 0; | |
3680 bd.endspaces = 0; | |
3681 vcol = 0; | |
3682 delcount = 0; | |
3683 | |
3684 /* add a new line */ | |
3685 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3686 { | |
3687 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3688 (colnr_T)1, FALSE) == FAIL) | |
3689 break; | |
3690 ++nr_lines; | |
3691 } | |
3692 /* get the old line and advance to the position to insert at */ | |
3693 oldp = ml_get_curline(); | |
3694 oldlen = (int)STRLEN(oldp); | |
3695 for (ptr = oldp; vcol < col && *ptr; ) | |
3696 { | |
3697 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3698 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3699 vcol += incr; |
3700 } | |
3701 bd.textcol = (colnr_T)(ptr - oldp); | |
3702 | |
3703 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3704 | |
3705 if (vcol < col) /* line too short, padd with spaces */ | |
3706 bd.startspaces = col - vcol; | |
3707 else if (vcol > col) | |
3708 { | |
3709 bd.endspaces = vcol - col; | |
3710 bd.startspaces = incr - bd.endspaces; | |
3711 --bd.textcol; | |
3712 delcount = 1; | |
3713 if (has_mbyte) | |
3714 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3715 if (oldp[bd.textcol] != TAB) | |
3716 { | |
3717 /* Only a Tab can be split into spaces. Other | |
3718 * characters will have to be moved to after the | |
3719 * block, causing misalignment. */ | |
3720 delcount = 0; | |
3721 bd.endspaces = 0; | |
3722 } | |
3723 } | |
3724 | |
3725 yanklen = (int)STRLEN(y_array[i]); | |
3726 | |
3727 /* calculate number of spaces required to fill right side of block*/ | |
3728 spaces = y_width + 1; | |
3729 for (j = 0; j < yanklen; j++) | |
5995 | 3730 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3731 if (spaces < 0) |
3732 spaces = 0; | |
3733 | |
3734 /* insert the new text */ | |
3735 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3736 newp = alloc(totlen + oldlen + 1); |
7 | 3737 if (newp == NULL) |
3738 break; | |
3739 /* copy part up to cursor to new line */ | |
3740 ptr = newp; | |
3741 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3742 ptr += bd.textcol; | |
3743 /* may insert some spaces before the new text */ | |
6929 | 3744 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3745 ptr += bd.startspaces; |
3746 /* insert the new text */ | |
3747 for (j = 0; j < count; ++j) | |
3748 { | |
3749 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3750 ptr += yanklen; | |
3751 | |
3752 /* insert block's trailing spaces only if there's text behind */ | |
3753 if ((j < count - 1 || !shortline) && spaces) | |
3754 { | |
6929 | 3755 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3756 ptr += spaces; |
3757 } | |
3758 } | |
3759 /* may insert some spaces after the new text */ | |
6929 | 3760 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3761 ptr += bd.endspaces; |
3762 /* move the text after the cursor to the end of the line. */ | |
3763 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3764 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3765 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3766 | |
3767 ++curwin->w_cursor.lnum; | |
3768 if (i == 0) | |
3769 curwin->w_cursor.col += bd.startspaces; | |
3770 } | |
3771 | |
3772 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3773 | |
3774 /* Set '[ mark. */ | |
3775 curbuf->b_op_start = curwin->w_cursor; | |
3776 curbuf->b_op_start.lnum = lnum; | |
3777 | |
3778 /* adjust '] mark */ | |
3779 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3780 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
3781 curbuf->b_op_end.coladd = 0; | |
3782 if (flags & PUT_CURSEND) | |
3783 { | |
916 | 3784 colnr_T len; |
3785 | |
7 | 3786 curwin->w_cursor = curbuf->b_op_end; |
3787 curwin->w_cursor.col++; | |
916 | 3788 |
3789 /* in Insert mode we might be after the NUL, correct for that */ | |
3790 len = (colnr_T)STRLEN(ml_get_curline()); | |
3791 if (curwin->w_cursor.col > len) | |
3792 curwin->w_cursor.col = len; | |
7 | 3793 } |
3794 else | |
3795 curwin->w_cursor.lnum = lnum; | |
3796 } | |
3797 else | |
3798 { | |
3799 /* | |
3800 * Character or Line mode | |
3801 */ | |
3802 if (y_type == MCHAR) | |
3803 { | |
3804 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3805 * char */ | |
3806 if (dir == FORWARD && gchar_cursor() != NUL) | |
3807 { | |
3808 if (has_mbyte) | |
3809 { | |
474 | 3810 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3811 |
3812 /* put it on the next of the multi-byte character. */ | |
3813 col += bytelen; | |
3814 if (yanklen) | |
3815 { | |
3816 curwin->w_cursor.col += bytelen; | |
3817 curbuf->b_op_end.col += bytelen; | |
3818 } | |
3819 } | |
3820 else | |
3821 { | |
3822 ++col; | |
3823 if (yanklen) | |
3824 { | |
3825 ++curwin->w_cursor.col; | |
3826 ++curbuf->b_op_end.col; | |
3827 } | |
3828 } | |
3829 } | |
3830 curbuf->b_op_start = curwin->w_cursor; | |
3831 } | |
3832 /* | |
3833 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3834 */ | |
3835 else if (dir == BACKWARD) | |
3836 --lnum; | |
699 | 3837 new_cursor = curwin->w_cursor; |
7 | 3838 |
3839 /* | |
3840 * simple case: insert into current line | |
3841 */ | |
3842 if (y_type == MCHAR && y_size == 1) | |
3843 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3844 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
|
3845 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3846 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3847 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3848 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
|
3849 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
|
3850 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
|
3851 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3852 |
5365 | 3853 do { |
3854 totlen = count * yanklen; | |
3855 if (totlen > 0) | |
7 | 3856 { |
5365 | 3857 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
|
3858 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
|
3859 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3860 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3861 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3862 } |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3863 newp = alloc(STRLEN(oldp) + totlen + 1); |
5365 | 3864 if (newp == NULL) |
3865 goto end; /* alloc() gave an error message */ | |
3866 mch_memmove(newp, oldp, (size_t)col); | |
3867 ptr = newp + col; | |
3868 for (i = 0; i < count; ++i) | |
3869 { | |
3870 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3871 ptr += yanklen; | |
3872 } | |
3873 STRMOVE(ptr, oldp + col); | |
3874 ml_replace(lnum, newp, FALSE); | |
3875 /* Place cursor on last putted char. */ | |
3876 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3877 { |
3878 /* make sure curwin->w_virtcol is updated */ | |
3879 changed_cline_bef_curs(); | |
5365 | 3880 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3881 } |
7 | 3882 } |
5365 | 3883 if (VIsual_active) |
3884 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3885 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3886 |
6379 | 3887 if (VIsual_active) /* reset lnum to the last visual line */ |
3888 lnum--; | |
3889 | |
7 | 3890 curbuf->b_op_end = curwin->w_cursor; |
3891 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3892 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3893 ++curwin->w_cursor.col; | |
3894 changed_bytes(lnum, col); | |
3895 } | |
3896 else | |
3897 { | |
3898 /* | |
3899 * Insert at least one line. When y_type is MCHAR, break the first | |
3900 * line in two. | |
3901 */ | |
3902 for (cnt = 1; cnt <= count; ++cnt) | |
3903 { | |
3904 i = 0; | |
3905 if (y_type == MCHAR) | |
3906 { | |
3907 /* | |
3908 * Split the current line in two at the insert position. | |
3909 * First insert y_array[size - 1] in front of second line. | |
3910 * Then append y_array[0] to first line. | |
3911 */ | |
3912 lnum = new_cursor.lnum; | |
3913 ptr = ml_get(lnum) + col; | |
3914 totlen = (int)STRLEN(y_array[y_size - 1]); | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3915 newp = alloc(STRLEN(ptr) + totlen + 1); |
7 | 3916 if (newp == NULL) |
3917 goto error; | |
3918 STRCPY(newp, y_array[y_size - 1]); | |
3919 STRCAT(newp, ptr); | |
3920 /* insert second line */ | |
3921 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3922 vim_free(newp); | |
3923 | |
3924 oldp = ml_get(lnum); | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3925 newp = alloc(col + yanklen + 1); |
7 | 3926 if (newp == NULL) |
3927 goto error; | |
3928 /* copy first part of line */ | |
3929 mch_memmove(newp, oldp, (size_t)col); | |
3930 /* append to first line */ | |
3931 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3932 ml_replace(lnum, newp, FALSE); | |
3933 | |
3934 curwin->w_cursor.lnum = lnum; | |
3935 i = 1; | |
3936 } | |
3937 | |
3938 for (; i < y_size; ++i) | |
3939 { | |
3940 if ((y_type != MCHAR || i < y_size - 1) | |
3941 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3942 == FAIL) | |
3943 goto error; | |
3944 lnum++; | |
3945 ++nr_lines; | |
3946 if (flags & PUT_FIXINDENT) | |
3947 { | |
3948 old_pos = curwin->w_cursor; | |
3949 curwin->w_cursor.lnum = lnum; | |
3950 ptr = ml_get(lnum); | |
3951 if (cnt == count && i == y_size - 1) | |
3952 lendiff = (int)STRLEN(ptr); | |
3953 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3954 if (*ptr == '#' && preprocs_left()) | |
3955 indent = 0; /* Leave # lines at start */ | |
3956 else | |
3957 #endif | |
3958 if (*ptr == NUL) | |
3959 indent = 0; /* Ignore empty lines */ | |
3960 else if (first_indent) | |
3961 { | |
3962 indent_diff = orig_indent - get_indent(); | |
3963 indent = orig_indent; | |
3964 first_indent = FALSE; | |
3965 } | |
3966 else if ((indent = get_indent() + indent_diff) < 0) | |
3967 indent = 0; | |
3968 (void)set_indent(indent, 0); | |
3969 curwin->w_cursor = old_pos; | |
3970 /* remember how many chars were removed */ | |
3971 if (cnt == count && i == y_size - 1) | |
3972 lendiff -= (int)STRLEN(ml_get(lnum)); | |
3973 } | |
3974 } | |
3975 } | |
3976 | |
3977 error: | |
3978 /* Adjust marks. */ | |
3979 if (y_type == MLINE) | |
3980 { | |
3981 curbuf->b_op_start.col = 0; | |
3982 if (dir == FORWARD) | |
3983 curbuf->b_op_start.lnum++; | |
3984 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3985 /* 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
|
3986 * 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
|
3987 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
|
3988 < 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
|
3989 #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
|
3990 || 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
|
3991 #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
|
3992 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3993 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 3994 (linenr_T)MAXLNUM, nr_lines, 0L); |
3995 | |
3996 /* note changed text for displaying and folding */ | |
3997 if (y_type == MCHAR) | |
3998 changed_lines(curwin->w_cursor.lnum, col, | |
3999 curwin->w_cursor.lnum + 1, nr_lines); | |
4000 else | |
4001 changed_lines(curbuf->b_op_start.lnum, 0, | |
4002 curbuf->b_op_start.lnum, nr_lines); | |
4003 | |
4004 /* put '] mark at last inserted character */ | |
4005 curbuf->b_op_end.lnum = lnum; | |
4006 /* correct length for change in indent */ | |
4007 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4008 if (col > 1) | |
4009 curbuf->b_op_end.col = col - 1; | |
4010 else | |
4011 curbuf->b_op_end.col = 0; | |
4012 | |
168 | 4013 if (flags & PUT_CURSLINE) |
4014 { | |
237 | 4015 /* ":put": put cursor on last inserted line */ |
168 | 4016 curwin->w_cursor.lnum = lnum; |
4017 beginline(BL_WHITE | BL_FIX); | |
4018 } | |
4019 else if (flags & PUT_CURSEND) | |
7 | 4020 { |
4021 /* put cursor after inserted text */ | |
4022 if (y_type == MLINE) | |
4023 { | |
4024 if (lnum >= curbuf->b_ml.ml_line_count) | |
4025 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4026 else | |
4027 curwin->w_cursor.lnum = lnum + 1; | |
4028 curwin->w_cursor.col = 0; | |
4029 } | |
4030 else | |
4031 { | |
4032 curwin->w_cursor.lnum = lnum; | |
4033 curwin->w_cursor.col = col; | |
4034 } | |
4035 } | |
4036 else if (y_type == MLINE) | |
4037 { | |
168 | 4038 /* put cursor on first non-blank in first inserted line */ |
7 | 4039 curwin->w_cursor.col = 0; |
4040 if (dir == FORWARD) | |
4041 ++curwin->w_cursor.lnum; | |
4042 beginline(BL_WHITE | BL_FIX); | |
4043 } | |
4044 else /* put cursor on first inserted character */ | |
4045 curwin->w_cursor = new_cursor; | |
4046 } | |
4047 } | |
4048 | |
4049 msgmore(nr_lines); | |
4050 curwin->w_set_curswant = TRUE; | |
4051 | |
4052 end: | |
4053 if (allocated) | |
4054 vim_free(insert_string); | |
840 | 4055 if (regname == '=') |
4056 vim_free(y_array); | |
4057 | |
5380 | 4058 VIsual_active = FALSE; |
4059 | |
140 | 4060 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4061 adjust_cursor_eol(); |
4062 } | |
4063 | |
4064 /* | |
4065 * When the cursor is on the NUL past the end of the line and it should not be | |
4066 * there move it left. | |
4067 */ | |
4068 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4069 adjust_cursor_eol(void) |
844 | 4070 { |
4071 if (curwin->w_cursor.col > 0 | |
4072 && gchar_cursor() == NUL | |
773 | 4073 && (ve_flags & VE_ONEMORE) == 0 |
7 | 4074 && !(restart_edit || (State & INSERT))) |
4075 { | |
557 | 4076 /* Put the cursor on the last character in the line. */ |
555 | 4077 dec_cursor(); |
844 | 4078 |
7 | 4079 if (ve_flags == VE_ALL) |
557 | 4080 { |
4081 colnr_T scol, ecol; | |
4082 | |
4083 /* Coladd is set to the width of the last character. */ | |
4084 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4085 curwin->w_cursor.coladd = ecol - scol + 1; | |
4086 } | |
7 | 4087 } |
4088 } | |
4089 | |
4090 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4091 /* | |
4092 * Return TRUE if lines starting with '#' should be left aligned. | |
4093 */ | |
17789
0f7ae8010787
patch 8.1.1891: functions used in one file are global
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
4094 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4095 preprocs_left(void) |
7 | 4096 { |
4097 return | |
4098 # ifdef FEAT_SMARTINDENT | |
4099 # ifdef FEAT_CINDENT | |
4100 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4101 # else | |
4102 curbuf->b_p_si | |
4103 # endif | |
4104 # endif | |
4105 # ifdef FEAT_CINDENT | |
5438 | 4106 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4107 && curbuf->b_ind_hash_comment == 0) | |
7 | 4108 # endif |
4109 ; | |
4110 } | |
4111 #endif | |
4112 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4113 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4114 * 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
|
4115 */ |
7 | 4116 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4117 get_register_name(int num) |
7 | 4118 { |
4119 if (num == -1) | |
4120 return '"'; | |
4121 else if (num < 10) | |
4122 return num + '0'; | |
4123 else if (num == DELETION_REGISTER) | |
4124 return '-'; | |
4125 #ifdef FEAT_CLIPBOARD | |
4126 else if (num == STAR_REGISTER) | |
4127 return '*'; | |
4128 else if (num == PLUS_REGISTER) | |
4129 return '+'; | |
4130 #endif | |
4131 else | |
4132 { | |
4133 #ifdef EBCDIC | |
4134 int i; | |
4135 | |
4136 /* EBCDIC is really braindead ... */ | |
4137 i = 'a' + (num - 10); | |
4138 if (i > 'i') | |
4139 i += 7; | |
4140 if (i > 'r') | |
4141 i += 8; | |
4142 return i; | |
4143 #else | |
4144 return num + 'a' - 10; | |
4145 #endif | |
4146 } | |
4147 } | |
4148 | |
4149 /* | |
4150 * ":dis" and ":registers": Display the contents of the yank registers. | |
4151 */ | |
4152 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4153 ex_display(exarg_T *eap) |
7 | 4154 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4155 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4156 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4157 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4158 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4159 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4160 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4161 char_u *arg = eap->arg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4162 int clen; |
7 | 4163 |
4164 if (arg != NULL && *arg == NUL) | |
4165 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4166 attr = HL_ATTR(HLF_8); |
7 | 4167 |
4168 /* Highlight title */ | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4169 msg_puts_title(_("\n--- Registers ---")); |
7 | 4170 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) |
4171 { | |
4172 name = get_register_name(i); | |
2644 | 4173 if (arg != NULL && vim_strchr(arg, name) == NULL |
4174 #ifdef ONE_CLIPBOARD | |
4175 /* Star register and plus register contain the same thing. */ | |
4176 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4177 #endif | |
4178 ) | |
7 | 4179 continue; /* did not ask for this register */ |
4180 | |
4181 #ifdef FEAT_CLIPBOARD | |
4182 /* Adjust register name for "unnamed" in 'clipboard'. | |
4183 * When it's a clipboard register, fill it with the current contents | |
4184 * of the clipboard. */ | |
4185 adjust_clip_reg(&name); | |
4186 (void)may_get_selection(name); | |
4187 #endif | |
4188 | |
4189 if (i == -1) | |
4190 { | |
4191 if (y_previous != NULL) | |
4192 yb = y_previous; | |
4193 else | |
4194 yb = &(y_regs[0]); | |
4195 } | |
4196 else | |
4197 yb = &(y_regs[i]); | |
2000 | 4198 |
4199 #ifdef FEAT_EVAL | |
4200 if (name == MB_TOLOWER(redir_reg) | |
4201 || (redir_reg == '"' && yb == y_previous)) | |
4202 continue; /* do not list register being written to, the | |
4203 * pointer can be freed */ | |
4204 #endif | |
4205 | |
7 | 4206 if (yb->y_array != NULL) |
4207 { | |
4208 msg_putchar('\n'); | |
4209 msg_putchar('"'); | |
4210 msg_putchar(name); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4211 msg_puts(" "); |
7 | 4212 |
4213 n = (int)Columns - 6; | |
4214 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4215 { | |
4216 if (j) | |
4217 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4218 msg_puts_attr("^J", attr); |
7 | 4219 n -= 2; |
4220 } | |
4221 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4222 { | |
474 | 4223 clen = (*mb_ptr2len)(p); |
22 | 4224 msg_outtrans_len(p, clen); |
4225 p += clen - 1; | |
7 | 4226 } |
4227 } | |
4228 if (n > 1 && yb->y_type == MLINE) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4229 msg_puts_attr("^J", attr); |
7 | 4230 out_flush(); /* show one line at a time */ |
4231 } | |
4232 ui_breakcheck(); | |
4233 } | |
4234 | |
4235 /* | |
4236 * display last inserted text | |
4237 */ | |
4238 if ((p = get_last_insert()) != NULL | |
4239 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4240 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4241 msg_puts("\n\". "); |
7 | 4242 dis_msg(p, TRUE); |
4243 } | |
4244 | |
4245 /* | |
4246 * display last command line | |
4247 */ | |
4248 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4249 && !got_int) | |
4250 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4251 msg_puts("\n\": "); |
7 | 4252 dis_msg(last_cmdline, FALSE); |
4253 } | |
4254 | |
4255 /* | |
4256 * display current file name | |
4257 */ | |
4258 if (curbuf->b_fname != NULL | |
4259 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4260 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4261 msg_puts("\n\"% "); |
7 | 4262 dis_msg(curbuf->b_fname, FALSE); |
4263 } | |
4264 | |
4265 /* | |
4266 * display alternate file name | |
4267 */ | |
4268 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4269 { | |
4270 char_u *fname; | |
4271 linenr_T dummy; | |
4272 | |
4273 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4274 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4275 msg_puts("\n\"# "); |
7 | 4276 dis_msg(fname, FALSE); |
4277 } | |
4278 } | |
4279 | |
4280 /* | |
4281 * display last search pattern | |
4282 */ | |
4283 if (last_search_pat() != NULL | |
4284 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4285 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4286 msg_puts("\n\"/ "); |
7 | 4287 dis_msg(last_search_pat(), FALSE); |
4288 } | |
4289 | |
4290 #ifdef FEAT_EVAL | |
4291 /* | |
4292 * display last used expression | |
4293 */ | |
4294 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4295 && !got_int) | |
4296 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4297 msg_puts("\n\"= "); |
7 | 4298 dis_msg(expr_line, FALSE); |
4299 } | |
4300 #endif | |
4301 } | |
4302 | |
4303 /* | |
4304 * display a string for do_dis() | |
4305 * truncate at end of screen line | |
4306 */ | |
4307 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4308 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4309 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4310 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4311 { |
4312 int n; | |
4313 int l; | |
4314 | |
4315 n = (int)Columns - 6; | |
4316 while (*p != NUL | |
4317 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4318 && (n -= ptr2cells(p)) >= 0) | |
4319 { | |
474 | 4320 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4321 { |
4322 msg_outtrans_len(p, l); | |
4323 p += l; | |
4324 } | |
4325 else | |
4326 msg_outtrans_len(p++, 1); | |
4327 } | |
4328 ui_breakcheck(); | |
4329 } | |
4330 | |
3562 | 4331 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4332 /* | |
4333 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4334 * after some white space), return a pointer to the text after it. Put a boolean | |
4335 * value indicating whether the line ends with an unclosed comment in | |
4336 * "is_comment". | |
4337 * line - line to be processed, | |
4338 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4339 * comment, |
3562 | 4340 * include_space - whether to also skip space following the comment leader, |
4341 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4342 * comment. |
3562 | 4343 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4344 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4345 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4346 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4347 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4348 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4349 int *is_comment) |
3562 | 4350 { |
4351 char_u *comment_flags = NULL; | |
4352 int lead_len; | |
4353 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4354 | |
4355 *is_comment = FALSE; | |
4356 if (leader_offset != -1) | |
4357 { | |
4358 /* Let's check whether the line ends with an unclosed comment. | |
4359 * If the last comment leader has COM_END in flags, there's no comment. | |
4360 */ | |
4361 while (*comment_flags) | |
4362 { | |
4363 if (*comment_flags == COM_END | |
4364 || *comment_flags == ':') | |
4365 break; | |
4366 ++comment_flags; | |
4367 } | |
4368 if (*comment_flags != COM_END) | |
4369 *is_comment = TRUE; | |
4370 } | |
4371 | |
4372 if (process == FALSE) | |
4373 return line; | |
4374 | |
4375 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4376 | |
4377 if (lead_len == 0) | |
4378 return line; | |
4379 | |
4380 /* Find: | |
4381 * - COM_END, | |
4382 * - colon, | |
4383 * whichever comes first. | |
4384 */ | |
4385 while (*comment_flags) | |
4386 { | |
3580 | 4387 if (*comment_flags == COM_END |
3562 | 4388 || *comment_flags == ':') |
4389 break; | |
4390 ++comment_flags; | |
4391 } | |
4392 | |
4393 /* If we found a colon, it means that we are not processing a line | |
3580 | 4394 * starting with a closing part of a three-part comment. That's good, |
4395 * because we don't want to remove those as this would be annoying. | |
3562 | 4396 */ |
4397 if (*comment_flags == ':' || *comment_flags == NUL) | |
4398 line += lead_len; | |
4399 | |
4400 return line; | |
4401 } | |
4402 #endif | |
4403 | |
7 | 4404 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4405 * 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
|
4406 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4407 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4408 * leaders should not be removed. | |
4409 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4410 * to set those marks. | |
7 | 4411 * |
1217 | 4412 * return FAIL for failure, OK otherwise |
7 | 4413 */ |
4414 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4415 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4416 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4417 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4418 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4419 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4420 int setmark) |
7 | 4421 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4422 char_u *curr = NULL; |
2597 | 4423 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
|
4424 char_u *cend; |
7 | 4425 char_u *newp; |
2597 | 4426 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
|
4427 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4428 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4429 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
|
4430 int sumsize = 0; /* size of the long new line */ |
7 | 4431 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4432 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4433 int ret = OK; |
3562 | 4434 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4435 int *comments = NULL; |
3562 | 4436 int remove_comments = (use_formatoptions == TRUE) |
4437 && has_format_option(FO_REMOVE_COMS); | |
4438 int prev_was_comment; | |
4439 #endif | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4440 #ifdef FEAT_TEXT_PROP |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4441 textprop_T **prop_lines = NULL; |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4442 int *prop_lengths = NULL; |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4443 #endif |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4444 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4445 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
|
4446 (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
|
4447 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4448 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4449 /* 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
|
4450 * 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
|
4451 * proper placement of each original line in the new one. */ |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
4452 spaces = lalloc_clear(count, TRUE); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4453 if (spaces == NULL) |
7 | 4454 return FAIL; |
3562 | 4455 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4456 if (remove_comments) | |
4457 { | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4458 comments = lalloc_clear(count * sizeof(int), TRUE); |
3562 | 4459 if (comments == NULL) |
4460 { | |
4461 vim_free(spaces); | |
4462 return FAIL; | |
4463 } | |
4464 } | |
4465 #endif | |
7 | 4466 |
4467 /* | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4468 * Don't move anything yet, just compute the final line length |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4469 * and setup the array of space strings lengths |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4470 * This loops forward over the joined lines. |
7 | 4471 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 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
|
4473 { |
2597 | 4474 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4475 if (t == 0 && setmark) |
5664 | 4476 { |
4477 /* Set the '[ mark. */ | |
4478 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4479 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4480 } | |
3562 | 4481 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4482 if (remove_comments) | |
4483 { | |
4484 /* We don't want to remove the comment leader if the | |
4485 * previous line is not a comment. */ | |
4486 if (t > 0 && prev_was_comment) | |
4487 { | |
4488 | |
4489 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4490 &prev_was_comment); | |
3576 | 4491 comments[t] = (int)(new_curr - curr); |
3562 | 4492 curr = new_curr; |
4493 } | |
4494 else | |
4495 curr = skip_comment(curr, FALSE, insert_space, | |
4496 &prev_was_comment); | |
4497 } | |
4498 #endif | |
4499 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 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
|
4501 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 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
|
4504 && (!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
|
4505 || (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
|
4506 && (!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
|
4507 || 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
|
4508 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 /* 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
|
4511 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 /* 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
|
4516 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4517 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 || (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
|
4519 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 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
|
4527 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4528 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4529 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4531 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
|
4532 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4535 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4536 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4538 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4541 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4544 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4545 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4553 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 /* 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
|
4555 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
|
4556 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4557 /* allocate the space for the new line */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
4558 newp = alloc(sumsize + 1); |
17797
ec1717981acf
patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
4559 if (newp == NULL) |
ec1717981acf
patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
4560 { |
ec1717981acf
patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
4561 ret = FAIL; |
ec1717981acf
patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
4562 goto theend; |
ec1717981acf
patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17789
diff
changeset
|
4563 } |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4564 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4565 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4566 |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4567 #ifdef FEAT_TEXT_PROP |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4568 // We need to move properties of the lines that are going to be deleted to |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4569 // the new long one. |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4570 if (curbuf->b_has_textprop && !text_prop_frozen) |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4571 { |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4572 // Allocate an array to copy the text properties of joined lines into. |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4573 // And another array to store the number of properties in each line. |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4574 prop_lines = ALLOC_CLEAR_MULT(textprop_T *, count - 1); |
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4575 prop_lengths = ALLOC_CLEAR_MULT(int, count - 1); |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4576 if (prop_lengths == NULL) |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4577 VIM_CLEAR(prop_lines); |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4578 } |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4579 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4580 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 * Move affected lines to the new long one. |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4583 * This loops backwards over the joined lines, including the original line. |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 * Move marks from each deleted line to the joined line, adjusting the |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4586 * column. This is not Vi compatible, but Vi deletes the marks, thus that |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4587 * should not really be a problem. |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4588 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4589 for (t = count - 1; ; --t) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4590 { |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4591 int spaces_removed; |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4592 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4593 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4594 mch_memmove(cend, curr, (size_t)currsize); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4595 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4596 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 cend -= spaces[t]; |
6929 | 4598 vim_memset(cend, ' ', (size_t)(spaces[t])); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4599 } |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4600 |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4601 // If deleting more spaces than adding, the cursor moves no more than |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4602 // what is added if it is inside these spaces. |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4603 spaces_removed = (curr - curr_start) - spaces[t]; |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4604 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4605 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4606 (long)(cend - newp - spaces_removed), spaces_removed); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4607 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4608 break; |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4609 #ifdef FEAT_TEXT_PROP |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4610 if (prop_lines != NULL) |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4611 adjust_props_for_join(curwin->w_cursor.lnum + t, |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4612 prop_lines + t - 1, prop_lengths + t - 1, |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4613 (long)(cend - newp - spaces_removed), spaces_removed); |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4614 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4615 |
2597 | 4616 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4617 #if defined(FEAT_COMMENTS) |
3562 | 4618 if (remove_comments) |
4619 curr += comments[t - 1]; | |
4620 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4621 if (insert_space && t > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4622 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4623 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4624 } |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4625 |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4626 #ifdef FEAT_TEXT_PROP |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4627 if (prop_lines != NULL) |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4628 join_prop_lines(curwin->w_cursor.lnum, newp, |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4629 prop_lines, prop_lengths, count); |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4630 else |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4631 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4632 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
7 | 4633 |
5848 | 4634 if (setmark) |
4635 { | |
4636 /* Set the '] mark. */ | |
4637 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
16680
c263acbbd961
patch 8.1.1342: using freed memory when joining line with text property
Bram Moolenaar <Bram@vim.org>
parents:
16678
diff
changeset
|
4638 curwin->w_buffer->b_op_end.col = (colnr_T)sumsize; |
5848 | 4639 } |
5664 | 4640 |
7 | 4641 /* Only report the change in the first line here, del_lines() will report |
4642 * the deleted line. */ | |
4643 changed_lines(curwin->w_cursor.lnum, currsize, | |
4644 curwin->w_cursor.lnum + 1, 0L); | |
4645 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 * Delete following lines. To do this we move the cursor there |
7 | 4647 * briefly, and then move it back. After del_lines() the cursor may |
4648 * have moved up (last line deleted), so the current lnum is kept in t. | |
4649 */ | |
4650 t = curwin->w_cursor.lnum; | |
4651 ++curwin->w_cursor.lnum; | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 del_lines(count - 1, FALSE); |
7 | 4653 curwin->w_cursor.lnum = t; |
4654 | |
4655 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 * Vi compatible: use the column of the first join |
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2310
diff
changeset
|
4658 * vim: use the column of the last join |
7 | 4659 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4660 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4661 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4662 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 |
7 | 4664 curwin->w_cursor.coladd = 0; |
4665 curwin->w_set_curswant = TRUE; | |
4666 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4667 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4668 vim_free(spaces); |
3562 | 4669 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4670 if (remove_comments) | |
4671 vim_free(comments); | |
4672 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4673 return ret; |
7 | 4674 } |
4675 | |
4676 #ifdef FEAT_COMMENTS | |
4677 /* | |
4678 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4679 * the first line. White-space is ignored. Note that the whole of | |
4680 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4681 */ | |
4682 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4683 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4684 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4685 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4686 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4687 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4688 char_u *leader2_flags) |
7 | 4689 { |
4690 int idx1 = 0, idx2 = 0; | |
4691 char_u *p; | |
4692 char_u *line1; | |
4693 char_u *line2; | |
4694 | |
4695 if (leader1_len == 0) | |
4696 return (leader2_len == 0); | |
4697 | |
4698 /* | |
4699 * If first leader has 'f' flag, the lines can be joined only if the | |
4700 * second line does not have a leader. | |
4701 * If first leader has 'e' flag, the lines can never be joined. | |
4702 * If fist leader has 's' flag, the lines can only be joined if there is | |
4703 * some text after it and the second line has the 'm' flag. | |
4704 */ | |
4705 if (leader1_flags != NULL) | |
4706 { | |
4707 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4708 { | |
4709 if (*p == COM_FIRST) | |
4710 return (leader2_len == 0); | |
4711 if (*p == COM_END) | |
4712 return FALSE; | |
4713 if (*p == COM_START) | |
4714 { | |
4715 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4716 return FALSE; | |
4717 if (leader2_flags == NULL || leader2_len == 0) | |
4718 return FALSE; | |
4719 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4720 if (*p == COM_MIDDLE) | |
4721 return TRUE; | |
4722 return FALSE; | |
4723 } | |
4724 } | |
4725 } | |
4726 | |
4727 /* | |
4728 * Get current line and next line, compare the leaders. | |
4729 * The first line has to be saved, only one line can be locked at a time. | |
4730 */ | |
4731 line1 = vim_strsave(ml_get(lnum)); | |
4732 if (line1 != NULL) | |
4733 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4734 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4735 ; |
4736 line2 = ml_get(lnum + 1); | |
4737 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4738 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4739 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4740 { |
4741 if (line1[idx1++] != line2[idx2]) | |
4742 break; | |
4743 } | |
4744 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4745 while (VIM_ISWHITE(line1[idx1])) |
7 | 4746 ++idx1; |
4747 } | |
4748 vim_free(line1); | |
4749 } | |
4750 return (idx2 == leader2_len && idx1 == leader1_len); | |
4751 } | |
4752 #endif | |
4753 | |
4754 /* | |
3252 | 4755 * Implementation of the format operator 'gq'. |
7 | 4756 */ |
4757 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4758 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4759 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4760 int keep_cursor) /* keep cursor on same text char */ |
7 | 4761 { |
4762 long old_line_count = curbuf->b_ml.ml_line_count; | |
4763 | |
4764 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4765 * can put it back there. */ | |
4766 curwin->w_cursor = oap->cursor_start; | |
4767 | |
4768 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4769 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4770 return; | |
4771 curwin->w_cursor = oap->start; | |
4772 | |
4773 if (oap->is_VIsual) | |
4774 /* When there is no change: need to remove the Visual selection */ | |
4775 redraw_curbuf_later(INVERTED); | |
4776 | |
4777 /* Set '[ mark at the start of the formatted area */ | |
4778 curbuf->b_op_start = oap->start; | |
4779 | |
4780 /* For "gw" remember the cursor position and put it back below (adjusted | |
4781 * for joined and split lines). */ | |
4782 if (keep_cursor) | |
4783 saved_cursor = oap->cursor_start; | |
4784 | |
1563 | 4785 format_lines(oap->line_count, keep_cursor); |
7 | 4786 |
4787 /* | |
4788 * Leave the cursor at the first non-blank of the last formatted line. | |
4789 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4790 * line, so "." will do the next lines. | |
4791 */ | |
4792 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4793 ++curwin->w_cursor.lnum; | |
4794 beginline(BL_WHITE | BL_FIX); | |
4795 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4796 msgmore(old_line_count); | |
4797 | |
4798 /* put '] mark on the end of the formatted area */ | |
4799 curbuf->b_op_end = curwin->w_cursor; | |
4800 | |
4801 if (keep_cursor) | |
4802 { | |
4803 curwin->w_cursor = saved_cursor; | |
4804 saved_cursor.lnum = 0; | |
4805 } | |
4806 | |
4807 if (oap->is_VIsual) | |
4808 { | |
4809 win_T *wp; | |
4810 | |
4811 FOR_ALL_WINDOWS(wp) | |
4812 { | |
4813 if (wp->w_old_cursor_lnum != 0) | |
4814 { | |
4815 /* When lines have been inserted or deleted, adjust the end of | |
4816 * the Visual area to be redrawn. */ | |
4817 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4818 wp->w_old_cursor_lnum += old_line_count; | |
4819 else | |
4820 wp->w_old_visual_lnum += old_line_count; | |
4821 } | |
4822 } | |
4823 } | |
4824 } | |
4825 | |
667 | 4826 #if defined(FEAT_EVAL) || defined(PROTO) |
4827 /* | |
4828 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4829 */ | |
4830 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4831 op_formatexpr(oparg_T *oap) |
667 | 4832 { |
4833 if (oap->is_VIsual) | |
4834 /* When there is no change: need to remove the Visual selection */ | |
4835 redraw_curbuf_later(INVERTED); | |
4836 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4837 if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0) |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4838 /* As documented: when 'formatexpr' returns non-zero fall back to |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4839 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4840 op_format(oap, FALSE); |
667 | 4841 } |
4842 | |
4843 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4844 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4845 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4846 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4847 int c) /* character to be inserted */ |
667 | 4848 { |
681 | 4849 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4850 OPT_LOCAL); | |
667 | 4851 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4852 char_u *fex; |
667 | 4853 |
4854 /* | |
4855 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4856 * Set v:char to the character to be inserted (can be NUL). |
667 | 4857 */ |
4858 set_vim_var_nr(VV_LNUM, lnum); | |
4859 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4860 set_vim_var_char(c); |
844 | 4861 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4862 /* Make a copy, the option could be changed while calling it. */ |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4863 fex = vim_strsave(curbuf->b_p_fex); |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4864 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4865 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4866 |
667 | 4867 /* |
4868 * Evaluate the function. | |
4869 */ | |
4870 if (use_sandbox) | |
4871 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4872 r = (int)eval_to_number(fex); |
667 | 4873 if (use_sandbox) |
4874 --sandbox; | |
844 | 4875 |
4876 set_vim_var_string(VV_CHAR, NULL, -1); | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4877 vim_free(fex); |
844 | 4878 |
667 | 4879 return r; |
4880 } | |
4881 #endif | |
4882 | |
7 | 4883 /* |
4884 * Format "line_count" lines, starting at the cursor position. | |
4885 * When "line_count" is negative, format until the end of the paragraph. | |
4886 * Lines after the cursor line are saved for undo, caller must have saved the | |
4887 * first line. | |
4888 */ | |
4889 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4890 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4891 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4892 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4893 { |
4894 int max_len; | |
4895 int is_not_par; /* current line not part of parag. */ | |
4896 int next_is_not_par; /* next line not part of paragraph */ | |
4897 int is_end_par; /* at end of paragraph */ | |
4898 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4899 int next_is_start_par = FALSE; | |
4900 #ifdef FEAT_COMMENTS | |
4901 int leader_len = 0; /* leader len of current line */ | |
4902 int next_leader_len; /* leader len of next line */ | |
4903 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4904 char_u *next_leader_flags; /* flags for leader of next line */ | |
4905 int do_comments; /* format comments */ | |
3584 | 4906 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4907 #endif |
4908 int advance = TRUE; | |
3584 | 4909 int second_indent = -1; /* indent for second line (comment |
4910 * aware) */ | |
7 | 4911 int do_second_indent; |
4912 int do_number_indent; | |
4913 int do_trail_white; | |
4914 int first_par_line = TRUE; | |
4915 int smd_save; | |
4916 long count; | |
4917 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4918 int force_format = FALSE; | |
4919 int old_State = State; | |
4920 | |
4921 /* length of a line to force formatting: 3 * 'tw' */ | |
4922 max_len = comp_textwidth(TRUE) * 3; | |
4923 | |
4924 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4925 #ifdef FEAT_COMMENTS | |
4926 do_comments = has_format_option(FO_Q_COMS); | |
4927 #endif | |
4928 do_second_indent = has_format_option(FO_Q_SECOND); | |
4929 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4930 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4931 | |
4932 /* | |
4933 * Get info about the previous and current line. | |
4934 */ | |
4935 if (curwin->w_cursor.lnum > 1) | |
4936 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4937 #ifdef FEAT_COMMENTS | |
4938 , &leader_len, &leader_flags, do_comments | |
4939 #endif | |
4940 ); | |
4941 else | |
4942 is_not_par = TRUE; | |
4943 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4944 #ifdef FEAT_COMMENTS | |
4945 , &next_leader_len, &next_leader_flags, do_comments | |
4946 #endif | |
4947 ); | |
4948 is_end_par = (is_not_par || next_is_not_par); | |
4949 if (!is_end_par && do_trail_white) | |
4950 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4951 | |
4952 curwin->w_cursor.lnum--; | |
4953 for (count = line_count; count != 0 && !got_int; --count) | |
4954 { | |
4955 /* | |
4956 * Advance to next paragraph. | |
4957 */ | |
4958 if (advance) | |
4959 { | |
4960 curwin->w_cursor.lnum++; | |
4961 prev_is_end_par = is_end_par; | |
4962 is_not_par = next_is_not_par; | |
4963 #ifdef FEAT_COMMENTS | |
4964 leader_len = next_leader_len; | |
4965 leader_flags = next_leader_flags; | |
4966 #endif | |
4967 } | |
4968 | |
4969 /* | |
4970 * The last line to be formatted. | |
4971 */ | |
4972 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4973 { | |
4974 next_is_not_par = TRUE; | |
4975 #ifdef FEAT_COMMENTS | |
4976 next_leader_len = 0; | |
4977 next_leader_flags = NULL; | |
4978 #endif | |
4979 } | |
4980 else | |
4981 { | |
4982 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
4983 #ifdef FEAT_COMMENTS | |
4984 , &next_leader_len, &next_leader_flags, do_comments | |
4985 #endif | |
4986 ); | |
4987 if (do_number_indent) | |
4988 next_is_start_par = | |
4989 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
4990 } | |
4991 advance = TRUE; | |
4992 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
4993 if (!is_end_par && do_trail_white) | |
4994 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
4995 | |
4996 /* | |
4997 * Skip lines that are not in a paragraph. | |
4998 */ | |
4999 if (is_not_par) | |
5000 { | |
5001 if (line_count < 0) | |
5002 break; | |
5003 } | |
5004 else | |
5005 { | |
5006 /* | |
5007 * For the first line of a paragraph, check indent of second line. | |
5008 * Don't do this for comments and empty lines. | |
5009 */ | |
5010 if (first_par_line | |
5011 && (do_second_indent || do_number_indent) | |
5012 && prev_is_end_par | |
3584 | 5013 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5014 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5015 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5016 { |
5017 #ifdef FEAT_COMMENTS | |
5018 if (leader_len == 0 && next_leader_len == 0) | |
5019 { | |
5020 /* no comment found */ | |
5021 #endif | |
5022 second_indent = | |
5023 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5024 #ifdef FEAT_COMMENTS |
3584 | 5025 } |
5026 else | |
5027 { | |
5028 second_indent = next_leader_len; | |
5029 do_comments_list = 1; | |
5030 } | |
5031 #endif | |
5032 } | |
7 | 5033 else if (do_number_indent) |
3584 | 5034 { |
5035 #ifdef FEAT_COMMENTS | |
5036 if (leader_len == 0 && next_leader_len == 0) | |
5037 { | |
5038 /* no comment found */ | |
5039 #endif | |
5040 second_indent = | |
5041 get_number_indent(curwin->w_cursor.lnum); | |
5042 #ifdef FEAT_COMMENTS | |
5043 } | |
5044 else | |
5045 { | |
5046 /* get_number_indent() is now "comment aware"... */ | |
5047 second_indent = | |
5048 get_number_indent(curwin->w_cursor.lnum); | |
5049 do_comments_list = 1; | |
5050 } | |
5051 #endif | |
5052 } | |
7 | 5053 } |
5054 | |
5055 /* | |
5056 * When the comment leader changes, it's the end of the paragraph. | |
5057 */ | |
5058 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5059 #ifdef FEAT_COMMENTS | |
5060 || !same_leader(curwin->w_cursor.lnum, | |
5061 leader_len, leader_flags, | |
5062 next_leader_len, next_leader_flags) | |
5063 #endif | |
5064 ) | |
5065 is_end_par = TRUE; | |
5066 | |
5067 /* | |
5068 * If we have got to the end of a paragraph, or the line is | |
5069 * getting long, format it. | |
5070 */ | |
5071 if (is_end_par || force_format) | |
5072 { | |
5073 if (need_set_indent) | |
5074 /* replace indent in first line with minimal number of | |
5075 * tabs and spaces, according to current options */ | |
5076 (void)set_indent(get_indent(), SIN_CHANGED); | |
5077 | |
5078 /* put cursor on last non-space */ | |
5079 State = NORMAL; /* don't go past end-of-line */ | |
5080 coladvance((colnr_T)MAXCOL); | |
5081 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5082 dec_cursor(); | |
5083 | |
5084 /* do the formatting, without 'showmode' */ | |
5085 State = INSERT; /* for open_line() */ | |
5086 smd_save = p_smd; | |
5087 p_smd = FALSE; | |
5088 insertchar(NUL, INSCHAR_FORMAT | |
5089 #ifdef FEAT_COMMENTS | |
5090 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5091 + (do_comments && do_comments_list |
5092 ? INSCHAR_COM_LIST : 0) | |
7 | 5093 #endif |
1563 | 5094 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5095 State = old_State; |
5096 p_smd = smd_save; | |
5097 second_indent = -1; | |
5098 /* at end of par.: need to set indent of next par. */ | |
5099 need_set_indent = is_end_par; | |
5100 if (is_end_par) | |
5101 { | |
5102 /* When called with a negative line count, break at the | |
5103 * end of the paragraph. */ | |
5104 if (line_count < 0) | |
5105 break; | |
5106 first_par_line = TRUE; | |
5107 } | |
5108 force_format = FALSE; | |
5109 } | |
5110 | |
5111 /* | |
5112 * When still in same paragraph, join the lines together. But | |
5403 | 5113 * first delete the leader from the second line. |
7 | 5114 */ |
5115 if (!is_end_par) | |
5116 { | |
5117 advance = FALSE; | |
5118 curwin->w_cursor.lnum++; | |
5119 curwin->w_cursor.col = 0; | |
5120 if (line_count < 0 && u_save_cursor() == FAIL) | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
5121 break; |
7 | 5122 #ifdef FEAT_COMMENTS |
5123 if (next_leader_len > 0) | |
5403 | 5124 { |
5125 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5126 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
5127 (long)-next_leader_len, 0); |
5403 | 5128 } else |
5129 #endif | |
5130 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5131 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5132 int indent = getwhitecols_curline(); |
5403 | 5133 |
5134 if (indent > 0) | |
5135 { | |
5136 (void)del_bytes(indent, FALSE, FALSE); | |
5137 mark_col_adjust(curwin->w_cursor.lnum, | |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
5138 (colnr_T)0, 0L, (long)-indent, 0); |
5415 | 5139 } |
5403 | 5140 } |
7 | 5141 curwin->w_cursor.lnum--; |
5848 | 5142 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5143 { |
5144 beep_flush(); | |
5145 break; | |
5146 } | |
5147 first_par_line = FALSE; | |
5148 /* If the line is getting long, format it next time */ | |
5149 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5150 force_format = TRUE; | |
5151 else | |
5152 force_format = FALSE; | |
5153 } | |
5154 } | |
5155 line_breakcheck(); | |
5156 } | |
5157 } | |
5158 | |
5159 /* | |
5160 * Return TRUE if line "lnum" ends in a white character. | |
5161 */ | |
5162 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5163 ends_in_white(linenr_T lnum) |
7 | 5164 { |
5165 char_u *s = ml_get(lnum); | |
5166 size_t l; | |
5167 | |
5168 if (*s == NUL) | |
5169 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5170 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5171 * invocation may call function multiple times". */ |
5172 l = STRLEN(s) - 1; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5173 return VIM_ISWHITE(s[l]); |
7 | 5174 } |
5175 | |
5176 /* | |
5177 * Blank lines, and lines containing only the comment leader, are left | |
5178 * untouched by the formatting. The function returns TRUE in this | |
5179 * case. It also returns TRUE when a line starts with the end of a comment | |
5180 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5181 * previous line. A new paragraph starts after a blank line, or when the | |
5182 * comment leader changes -- webb. | |
5183 */ | |
5184 #ifdef FEAT_COMMENTS | |
5185 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5186 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5187 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5188 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5189 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5190 int do_comments) |
7 | 5191 { |
5192 char_u *flags = NULL; /* init for GCC */ | |
5193 char_u *ptr; | |
5194 | |
5195 ptr = ml_get(lnum); | |
5196 if (do_comments) | |
3562 | 5197 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5198 else |
5199 *leader_len = 0; | |
5200 | |
5201 if (*leader_len > 0) | |
5202 { | |
5203 /* | |
5204 * Search for 'e' flag in comment leader flags. | |
5205 */ | |
5206 flags = *leader_flags; | |
5207 while (*flags && *flags != ':' && *flags != COM_END) | |
5208 ++flags; | |
5209 } | |
5210 | |
5211 return (*skipwhite(ptr + *leader_len) == NUL | |
5212 || (*leader_len > 0 && *flags == COM_END) | |
5213 || startPS(lnum, NUL, FALSE)); | |
5214 } | |
5215 #else | |
5216 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5217 fmt_check_par(linenr_T lnum) |
7 | 5218 { |
5219 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5220 } | |
5221 #endif | |
5222 | |
5223 /* | |
5224 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5225 * previous line is in the same paragraph. Used for auto-formatting. | |
5226 */ | |
5227 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5228 paragraph_start(linenr_T lnum) |
7 | 5229 { |
5230 char_u *p; | |
5231 #ifdef FEAT_COMMENTS | |
5232 int leader_len = 0; /* leader len of current line */ | |
5233 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5234 int next_leader_len; /* leader len of next line */ | |
5235 char_u *next_leader_flags; /* flags for leader of next line */ | |
5236 int do_comments; /* format comments */ | |
5237 #endif | |
5238 | |
5239 if (lnum <= 1) | |
5240 return TRUE; /* start of the file */ | |
5241 | |
5242 p = ml_get(lnum - 1); | |
5243 if (*p == NUL) | |
5244 return TRUE; /* after empty line */ | |
5245 | |
5246 #ifdef FEAT_COMMENTS | |
5247 do_comments = has_format_option(FO_Q_COMS); | |
5248 #endif | |
5249 if (fmt_check_par(lnum - 1 | |
5250 #ifdef FEAT_COMMENTS | |
5251 , &leader_len, &leader_flags, do_comments | |
5252 #endif | |
5253 )) | |
5254 return TRUE; /* after non-paragraph line */ | |
5255 | |
5256 if (fmt_check_par(lnum | |
5257 #ifdef FEAT_COMMENTS | |
5258 , &next_leader_len, &next_leader_flags, do_comments | |
5259 #endif | |
5260 )) | |
5261 return TRUE; /* "lnum" is not a paragraph line */ | |
5262 | |
5263 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5264 return TRUE; /* missing trailing space in previous line. */ | |
5265 | |
5266 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5267 return TRUE; /* numbered item starts in "lnum". */ | |
5268 | |
5269 #ifdef FEAT_COMMENTS | |
5270 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5271 next_leader_len, next_leader_flags)) | |
5272 return TRUE; /* change of comment leader. */ | |
5273 #endif | |
5274 | |
5275 return FALSE; | |
5276 } | |
5277 | |
5278 /* | |
5279 * prepare a few things for block mode yank/delete/tilde | |
5280 * | |
5281 * for delete: | |
5282 * - textlen includes the first/last char to be (partly) deleted | |
5283 * - start/endspaces is the number of columns that are taken by the | |
5284 * first/last deleted char minus the number of columns that have to be | |
1839 | 5285 * deleted. |
5286 * for yank and tilde: | |
7 | 5287 * - textlen includes the first/last char to be wholly yanked |
5288 * - start/endspaces is the number of columns of the first/last yanked char | |
5289 * that are to be yanked. | |
5290 */ | |
5291 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5292 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5293 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5294 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5295 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5296 int is_del) |
7 | 5297 { |
5298 int incr = 0; | |
5299 char_u *pend; | |
5300 char_u *pstart; | |
5301 char_u *line; | |
5302 char_u *prev_pstart; | |
5303 char_u *prev_pend; | |
5304 | |
5305 bdp->startspaces = 0; | |
5306 bdp->endspaces = 0; | |
5307 bdp->textlen = 0; | |
5308 bdp->start_vcol = 0; | |
5309 bdp->end_vcol = 0; | |
5310 bdp->is_short = FALSE; | |
5311 bdp->is_oneChar = FALSE; | |
5312 bdp->pre_whitesp = 0; | |
5313 bdp->pre_whitesp_c = 0; | |
5314 bdp->end_char_vcols = 0; | |
5315 bdp->start_char_vcols = 0; | |
5316 | |
5317 line = ml_get(lnum); | |
5318 pstart = line; | |
5319 prev_pstart = line; | |
5320 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5321 { | |
5322 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5323 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5324 bdp->start_vcol += incr; |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5325 if (VIM_ISWHITE(*pstart)) |
7 | 5326 { |
5327 bdp->pre_whitesp += incr; | |
5328 bdp->pre_whitesp_c++; | |
5329 } | |
5330 else | |
5331 { | |
5332 bdp->pre_whitesp = 0; | |
5333 bdp->pre_whitesp_c = 0; | |
5334 } | |
5335 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5336 MB_PTR_ADV(pstart); |
7 | 5337 } |
5338 bdp->start_char_vcols = incr; | |
5339 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5340 { | |
5341 bdp->end_vcol = bdp->start_vcol; | |
5342 bdp->is_short = TRUE; | |
5343 if (!is_del || oap->op_type == OP_APPEND) | |
5344 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5345 } | |
5346 else | |
5347 { | |
5348 /* notice: this converts partly selected Multibyte characters to | |
5349 * spaces, too. */ | |
5350 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5351 if (is_del && bdp->startspaces) | |
5352 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5353 pend = pstart; | |
5354 bdp->end_vcol = bdp->start_vcol; | |
5355 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5356 { | |
5357 bdp->is_oneChar = TRUE; | |
5358 if (oap->op_type == OP_INSERT) | |
5359 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5360 else if (oap->op_type == OP_APPEND) | |
5361 { | |
5362 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5363 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5364 } | |
5365 else | |
5366 { | |
5367 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5368 if (is_del && oap->op_type != OP_LSHIFT) | |
5369 { | |
5370 /* just putting the sum of those two into | |
5371 * bdp->startspaces doesn't work for Visual replace, | |
5372 * so we have to split the tab in two */ | |
5373 bdp->startspaces = bdp->start_char_vcols | |
5374 - (bdp->start_vcol - oap->start_vcol); | |
5375 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5376 } | |
5377 } | |
5378 } | |
5379 else | |
5380 { | |
5381 prev_pend = pend; | |
5382 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5383 { | |
5384 /* Count a tab for what it's worth (if list mode not on) */ | |
5385 prev_pend = pend; | |
6535 | 5386 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5387 bdp->end_vcol += incr; |
5388 } | |
5389 if (bdp->end_vcol <= oap->end_vcol | |
5390 && (!is_del | |
5391 || oap->op_type == OP_APPEND | |
5392 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5393 { | |
5394 bdp->is_short = TRUE; | |
5395 /* Alternative: include spaces to fill up the block. | |
5396 * Disadvantage: can lead to trailing spaces when the line is | |
5397 * short where the text is put */ | |
5398 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5399 if (oap->op_type == OP_APPEND || virtual_op) | |
5400 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5401 + oap->inclusive; |
7 | 5402 else |
5403 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5404 } | |
5405 else if (bdp->end_vcol > oap->end_vcol) | |
5406 { | |
5407 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5408 if (!is_del && bdp->endspaces) | |
5409 { | |
5410 bdp->endspaces = incr - bdp->endspaces; | |
5411 if (pend != pstart) | |
5412 pend = prev_pend; | |
5413 } | |
5414 } | |
5415 } | |
5416 bdp->end_char_vcols = incr; | |
5417 if (is_del && bdp->startspaces) | |
5418 pstart = prev_pstart; | |
5419 bdp->textlen = (int)(pend - pstart); | |
5420 } | |
5421 bdp->textcol = (colnr_T) (pstart - line); | |
5422 bdp->textstart = pstart; | |
5423 } | |
5424 | |
5425 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5426 * Handle the add/subtract operator. |
7 | 5427 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5429 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5430 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5431 linenr_T Prenum1, /* Amount of add/subtract */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5432 int g_cmd) /* was g<c-a>/g<c-x> */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5439 // do_addsub() might trigger re-evaluation of 'foldexpr' halfway, when the |
15967
ddd82b1c9e9d
patch 8.1.0989: various small code ugliness
Bram Moolenaar <Bram@vim.org>
parents:
15840
diff
changeset
|
5440 // buffer is not completely updated yet. Postpone updating folds until before |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5441 // the call to changed_lines(). |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5442 #ifdef FEAT_FOLDING |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5443 disable_fold_update++; |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5444 #endif |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5445 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 if (u_save_cursor() == FAIL) |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5450 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5451 #ifdef FEAT_FOLDING |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5452 disable_fold_update--; |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5453 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5454 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5455 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 change_cnt = do_addsub(oap->op_type, &pos, 0, amount); |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5457 #ifdef FEAT_FOLDING |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5458 disable_fold_update--; |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5459 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 changed_lines(pos.lnum, 0, pos.lnum + 1, 0L); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5462 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5463 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5465 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5466 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5467 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5468 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 if (u_save((linenr_T)(oap->start.lnum - 1), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5470 (linenr_T)(oap->end.lnum + 1)) == FAIL) |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5471 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5472 #ifdef FEAT_FOLDING |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5473 disable_fold_update--; |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5474 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5476 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5480 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5481 if (oap->block_mode) /* Visual block mode */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5482 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5483 block_prep(oap, &bd, pos.lnum, FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5484 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5485 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5486 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5487 else if (oap->motion_type == MLINE) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5488 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5489 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5490 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5491 length = (colnr_T)STRLEN(ml_get(pos.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5492 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5493 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5494 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5495 if (pos.lnum == oap->start.lnum && !oap->inclusive) |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5496 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5497 length = (colnr_T)STRLEN(ml_get(pos.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5498 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5499 if (pos.lnum == oap->start.lnum) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5500 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5501 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5502 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5503 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5504 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5505 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5506 length = (int)STRLEN(ml_get(oap->end.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5507 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5508 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5509 length = oap->end.col - pos.col + 1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5510 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5511 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5512 one_change = do_addsub(oap->op_type, &pos, length, amount); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5513 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 /* Remember the start position of the first change. */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 netbeans_removed(curbuf, pos.lnum, pos.col, (long)length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5527 netbeans_inserted(curbuf, pos.lnum, pos.col, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5528 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5529 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5530 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5531 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 } |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5534 |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5535 #ifdef FEAT_FOLDING |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5536 disable_fold_update--; |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5537 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5538 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5539 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5540 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5541 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 /* No change: need to remove the Visual selection */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5543 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 /* Set '[ mark if something changed. Keep the last end |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5546 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5547 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5549 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5550 if (change_cnt > p_report) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
5551 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
5552 change_cnt), change_cnt); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5553 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5554 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5555 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 * Add or subtract 'Prenum1' from a number in a line |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5558 * op_type is OP_NR_ADD or OP_NR_SUB |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5559 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5560 * Returns TRUE if some character was changed. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5561 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5562 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5563 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5564 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5565 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5566 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5567 linenr_T Prenum1) |
7 | 5568 { |
5569 int col; | |
5570 char_u *buf1; | |
5571 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5572 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5573 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5574 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5575 uvarnumber_T oldn; |
7 | 5576 char_u *ptr; |
5577 int c; | |
5578 int todel; | |
5579 int dohex; | |
5580 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5581 int dobin; |
7 | 5582 int doalp; |
5583 int firstdigit; | |
5584 int subtract; | |
6868 | 5585 int negative = FALSE; |
6891 | 5586 int was_positive = TRUE; |
6868 | 5587 int visual = VIsual_active; |
6921 | 5588 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5589 pos_T save_cursor = curwin->w_cursor; |
6927 | 5590 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5591 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5592 pos_T endpos; |
7 | 5593 |
5594 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5595 dooct = (vim_strchr(curbuf->b_p_nf, 'o') != NULL); /* "Octal" */ | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5596 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5597 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5598 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5602 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5603 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5604 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 |
7 | 5606 /* |
5607 * First check if we are on a hexadecimal number, after the "0x". | |
5608 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5611 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5612 while (col > 0 && vim_isbdigit(ptr[col])) |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5613 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5614 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5615 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5616 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5617 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5618 |
6868 | 5619 if (dohex) |
5620 while (col > 0 && vim_isxdigit(ptr[col])) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5621 { |
6868 | 5622 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5623 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5624 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5625 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5626 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5627 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5628 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5629 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5630 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5631 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5632 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5633 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5634 !(*mb_head_off)(ptr, ptr + col - 1)) |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5635 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5636 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5637 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5638 /* In case of binary/hexadecimal pattern overlap match, rescan */ |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5639 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5641 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5642 while (col > 0 && vim_isdigit(ptr[col])) |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5643 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5644 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5645 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5646 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5647 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5648 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5649 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5650 if (( dohex |
6868 | 5651 && col > 0 |
5652 && (ptr[col] == 'X' | |
5653 || ptr[col] == 'x') | |
5654 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5655 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5656 !(*mb_head_off)(ptr, ptr + col - 1)) |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5657 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5658 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5659 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5660 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5661 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5662 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5663 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5664 !(*mb_head_off)(ptr, ptr + col - 1)) |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5665 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5666 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5667 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5668 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5669 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5670 col -= (*mb_head_off)(ptr, ptr + col); |
6868 | 5671 } |
5672 else | |
7 | 5673 { |
6868 | 5674 /* |
5675 * Search forward and then backward to find the start of number. | |
5676 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 col = pos->col; |
6868 | 5678 |
5679 while (ptr[col] != NUL | |
5680 && !vim_isdigit(ptr[col]) | |
5681 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5682 col += MB_PTR2LEN(ptr + col); |
6868 | 5683 |
5684 while (col > 0 | |
5685 && vim_isdigit(ptr[col - 1]) | |
5686 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5687 { |
6868 | 5688 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5689 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5690 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5691 } |
6868 | 5692 } |
5693 } | |
5694 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5701 int mb_len = MB_PTR2LEN(ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5702 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5703 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5704 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5710 if (col > pos->col && ptr[col - 1] == '-' |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5711 && (!has_mbyte || !(*mb_head_off)(ptr, ptr + col - 1))) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5712 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 * If a number was found, and saving for undo works, replace the number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 if (!VIM_ISDIGIT(firstdigit) && !(doalp && ASCII_ISALPHA(firstdigit))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5734 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 firstdigit = 'a'; |
6927 | 5739 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5747 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5750 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 firstdigit = 'z'; |
6927 | 5755 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5762 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5764 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5769 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5771 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5774 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5775 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5776 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5777 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 maxlen = (curbuf->b_visual.vi_curswant == MAXCOL |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 + (dohex ? STR2NR_HEX : 0), |
16706
77bcb5055fec
patch 8.1.1355: obvious mistakes are accepted as valid expressions
Bram Moolenaar <Bram@vim.org>
parents:
16698
diff
changeset
|
5793 NULL, &n, maxlen, FALSE); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 /* ignore leading '-' for hex and octal and bin numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5807 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5811 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5813 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 if (subtract) |
6927 | 5818 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 if (n > oldn) |
6868 | 5820 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5821 n = 1 + (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 negative ^= TRUE; |
6868 | 5823 } |
7 | 5824 } |
5825 else | |
6868 | 5826 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 if (n < oldn) |
6868 | 5829 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5830 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 negative ^= TRUE; |
6868 | 5832 } |
6927 | 5833 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 if (n == 0) |
6868 | 5835 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 if (visual && !was_positive && !negative && col > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 * Don't include the '-' in the length, only the length of the |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 * part after it is kept the same. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5857 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5858 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 if (c < 0x100 && isalpha(c)) |
6868 | 5863 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 hexupper = TRUE; |
6868 | 5866 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 hexupper = FALSE; |
6891 | 5868 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 /* del_char() will mark line needing displaying */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 (void)del_char(FALSE); |
6868 | 5871 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 * When there are many leading zeros it could be very long. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
5879 buf1 = alloc(length + NUMBUFLEN); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5883 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5904 int bits = sizeof(uvarnumber_T) * 8; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 buf2[i++] = ((n >> (bit - 1)) & 0x1) ? '1' : '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5912 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5915 else if (pre == 0) |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5916 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5917 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 else if (pre == '0') |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5919 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5920 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 else if (pre && hexupper) |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5922 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5923 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 else |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5925 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5926 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 * Adjust number of zeros to the new number of digits, so the |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 * total length of the number remains the same. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 * the result may look like an octal number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 while (length-- > 0) |
6868 | 5937 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 ins_str(buf1); /* insert the new number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 if (did_change && curwin->w_cursor.col) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5944 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5947 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5948 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5949 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5950 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5951 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5952 if (curbuf->b_op_end.col > 0) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5953 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5954 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5955 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5956 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5957 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5958 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5959 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5960 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5961 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5962 return did_change; |
7 | 5963 } |
5964 | |
5965 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
5966 /* | |
5967 * SELECTION / PRIMARY ('*') | |
5968 * | |
5969 * Text selection stuff that uses the GUI selection register '*'. When using a | |
5970 * GUI this may be text from another window, otherwise it is the last text we | |
5971 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
5972 * button performs the paste, otherwise you will need to do <"*p>. " | |
5973 * If not under X, it is synonymous with the clipboard register '+'. | |
5974 * | |
5975 * X CLIPBOARD ('+') | |
5976 * | |
5977 * Text selection stuff that uses the GUI clipboard register '+'. | |
5978 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
5979 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
5980 * otherwise you will need to do <"+p>. " | |
5981 * If not under X, it is synonymous with the selection register '*'. | |
5982 */ | |
5983 | |
5984 /* | |
5985 * 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
|
5986 * so that the text is still available after Vim has exited. X selections |
7 | 5987 * only exist while the owning application exists, so we write to the |
5988 * permanent (while X runs) store CUT_BUFFER0. | |
5989 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
5990 * 'permanent' of the two), otherwise the PRIMARY one. | |
5991 * For now, use a hard-coded sanity limit of 1Mb of data. | |
5992 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
5993 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 5994 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5995 x11_export_final_selection(void) |
7 | 5996 { |
5997 Display *dpy; | |
5998 char_u *str = NULL; | |
5999 long_u len = 0; | |
6000 int motion_type = -1; | |
6001 | |
6002 # ifdef FEAT_GUI | |
6003 if (gui.in_use) | |
6004 dpy = X_DISPLAY; | |
6005 else | |
6006 # endif | |
6007 # ifdef FEAT_XCLIPBOARD | |
6008 dpy = xterm_dpy; | |
6009 # else | |
6010 return; | |
6011 # endif | |
6012 | |
6013 /* Get selection to export */ | |
6014 if (clip_plus.owned) | |
6015 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6016 else if (clip_star.owned) | |
6017 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6018 | |
6019 /* Check it's OK */ | |
6020 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6021 && len < 1024*1024 && len > 0) | |
6022 { | |
4201 | 6023 int ok = TRUE; |
6024 | |
1924 | 6025 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6026 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6027 * encoding conversion usually doesn't work, so keep the text as-is. | |
6028 */ | |
6029 if (has_mbyte) | |
6030 { | |
6031 vimconv_T vc; | |
6032 | |
6033 vc.vc_type = CONV_NONE; | |
6034 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6035 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6036 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6037 char_u *conv_str; |
2007 | 6038 |
4201 | 6039 vc.vc_fail = TRUE; |
2007 | 6040 conv_str = string_convert(&vc, str, &intlen); |
6041 len = intlen; | |
1924 | 6042 if (conv_str != NULL) |
6043 { | |
6044 vim_free(str); | |
6045 str = conv_str; | |
6046 } | |
4201 | 6047 else |
6048 { | |
6049 ok = FALSE; | |
6050 } | |
1924 | 6051 convert_setup(&vc, NULL, NULL); |
6052 } | |
4201 | 6053 else |
6054 { | |
6055 ok = FALSE; | |
6056 } | |
1924 | 6057 } |
4201 | 6058 |
6059 /* Do not store the string if conversion failed. Better to use any | |
6060 * other selection than garbled text. */ | |
6061 if (ok) | |
6062 { | |
6063 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6064 XFlush(dpy); | |
6065 } | |
7 | 6066 } |
6067 | |
6068 vim_free(str); | |
6069 } | |
6070 #endif | |
6071 | |
6072 void | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6073 clip_free_selection(Clipboard_T *cbd) |
7 | 6074 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6075 yankreg_T *y_ptr = y_current; |
7 | 6076 |
6077 if (cbd == &clip_plus) | |
6078 y_current = &y_regs[PLUS_REGISTER]; | |
6079 else | |
6080 y_current = &y_regs[STAR_REGISTER]; | |
6081 free_yank_all(); | |
6082 y_current->y_size = 0; | |
6083 y_current = y_ptr; | |
6084 } | |
6085 | |
6086 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
6087 * Get the selected text and put it in register '*' or '+'. |
7 | 6088 */ |
6089 void | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6090 clip_get_selection(Clipboard_T *cbd) |
7 | 6091 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 yankreg_T *old_y_previous, *old_y_current; |
7 | 6093 pos_T old_cursor; |
6094 pos_T old_visual; | |
6095 int old_visual_mode; | |
6096 colnr_T old_curswant; | |
6097 int old_set_curswant; | |
6098 pos_T old_op_start, old_op_end; | |
6099 oparg_T oa; | |
6100 cmdarg_T ca; | |
6101 | |
6102 if (cbd->owned) | |
6103 { | |
6104 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6105 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6106 return; | |
6107 | |
6108 /* Get the text between clip_star.start & clip_star.end */ | |
6109 old_y_previous = y_previous; | |
6110 old_y_current = y_current; | |
6111 old_cursor = curwin->w_cursor; | |
6112 old_curswant = curwin->w_curswant; | |
6113 old_set_curswant = curwin->w_set_curswant; | |
6114 old_op_start = curbuf->b_op_start; | |
6115 old_op_end = curbuf->b_op_end; | |
6116 old_visual = VIsual; | |
6117 old_visual_mode = VIsual_mode; | |
6118 clear_oparg(&oa); | |
6119 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6120 oa.op_type = OP_YANK; | |
6121 vim_memset(&ca, 0, sizeof(ca)); | |
6122 ca.oap = &oa; | |
6123 ca.cmdchar = 'y'; | |
6124 ca.count1 = 1; | |
6125 ca.retval = CA_NO_ADJ_OP_END; | |
6126 do_pending_operator(&ca, 0, TRUE); | |
6127 y_previous = old_y_previous; | |
6128 y_current = old_y_current; | |
6129 curwin->w_cursor = old_cursor; | |
688 | 6130 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6131 curwin->w_curswant = old_curswant; |
6132 curwin->w_set_curswant = old_set_curswant; | |
6133 curbuf->b_op_start = old_op_start; | |
6134 curbuf->b_op_end = old_op_end; | |
6135 VIsual = old_visual; | |
6136 VIsual_mode = old_visual_mode; | |
6137 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6138 else if (!is_clipboard_needs_update()) |
7 | 6139 { |
6140 clip_free_selection(cbd); | |
6141 | |
6142 /* Try to get selected text from another window */ | |
6143 clip_gen_request_selection(cbd); | |
6144 } | |
6145 } | |
6146 | |
2896 | 6147 /* |
6148 * Convert from the GUI selection string into the '*'/'+' register. | |
6149 */ | |
7 | 6150 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6151 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6152 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6153 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6154 long len, |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6155 Clipboard_T *cbd) |
7 | 6156 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 yankreg_T *y_ptr; |
7 | 6158 |
6159 if (cbd == &clip_plus) | |
6160 y_ptr = &y_regs[PLUS_REGISTER]; | |
6161 else | |
6162 y_ptr = &y_regs[STAR_REGISTER]; | |
6163 | |
6164 clip_free_selection(cbd); | |
6165 | |
5798 | 6166 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6167 } |
6168 | |
6169 /* | |
6170 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6171 * with length *len. | |
6172 * Returns the motion type, or -1 for failure. | |
6173 */ | |
6174 int | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6175 clip_convert_selection(char_u **str, long_u *len, Clipboard_T *cbd) |
7 | 6176 { |
6177 char_u *p; | |
6178 int lnum; | |
6179 int i, j; | |
6180 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6181 yankreg_T *y_ptr; |
7 | 6182 |
6183 if (cbd == &clip_plus) | |
6184 y_ptr = &y_regs[PLUS_REGISTER]; | |
6185 else | |
6186 y_ptr = &y_regs[STAR_REGISTER]; | |
6187 | |
6188 #ifdef USE_CRNL | |
6189 eolsize = 2; | |
6190 #else | |
6191 eolsize = 1; | |
6192 #endif | |
6193 | |
6194 *str = NULL; | |
6195 *len = 0; | |
6196 if (y_ptr->y_array == NULL) | |
6197 return -1; | |
6198 | |
6199 for (i = 0; i < y_ptr->y_size; i++) | |
6200 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6201 | |
6202 /* | |
6203 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6204 */ | |
6205 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6206 *len -= eolsize; | |
6207 | |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6208 p = *str = alloc(*len + 1); // add one to avoid zero |
7 | 6209 if (p == NULL) |
6210 return -1; | |
6211 lnum = 0; | |
6212 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6213 { | |
6214 if (y_ptr->y_array[lnum][j] == '\n') | |
6215 p[i] = NUL; | |
6216 else if (y_ptr->y_array[lnum][j] == NUL) | |
6217 { | |
6218 #ifdef USE_CRNL | |
6219 p[i++] = '\r'; | |
6220 #endif | |
6221 p[i] = '\n'; | |
6222 lnum++; | |
6223 j = -1; | |
6224 } | |
6225 else | |
6226 p[i] = y_ptr->y_array[lnum][j]; | |
6227 } | |
6228 return y_ptr->y_type; | |
6229 } | |
6230 | |
6231 | |
6232 /* | |
6233 * If we have written to a clipboard register, send the text to the clipboard. | |
6234 */ | |
6235 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6236 may_set_selection(void) |
7 | 6237 { |
6238 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6239 { | |
6240 clip_own_selection(&clip_star); | |
6241 clip_gen_set_selection(&clip_star); | |
6242 } | |
6243 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6244 { | |
6245 clip_own_selection(&clip_plus); | |
6246 clip_gen_set_selection(&clip_plus); | |
6247 } | |
6248 } | |
6249 | |
6250 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6251 | |
6252 | |
6253 #if defined(FEAT_DND) || defined(PROTO) | |
6254 /* | |
6255 * Replace the contents of the '~' register with str. | |
6256 */ | |
6257 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6258 dnd_yank_drag_data(char_u *str, long len) |
7 | 6259 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6260 yankreg_T *curr; |
7 | 6261 |
6262 curr = y_current; | |
6263 y_current = &y_regs[TILDE_REGISTER]; | |
6264 free_yank_all(); | |
5798 | 6265 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6266 y_current = curr; |
6267 } | |
6268 #endif | |
6269 | |
6270 | |
6271 #if defined(FEAT_EVAL) || defined(PROTO) | |
6272 /* | |
6273 * Return the type of a register. | |
6274 * Used for getregtype() | |
6275 * Returns MAUTO for error. | |
6276 */ | |
6277 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6278 get_reg_type(int regname, long *reglen) |
7 | 6279 { |
6280 switch (regname) | |
6281 { | |
6282 case '%': /* file name */ | |
6283 case '#': /* alternate file name */ | |
6284 case '=': /* expression */ | |
6285 case ':': /* last command line */ | |
6286 case '/': /* last search-pattern */ | |
6287 case '.': /* last inserted text */ | |
6288 #ifdef FEAT_SEARCHPATH | |
6289 case Ctrl_F: /* Filename under cursor */ | |
6290 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6291 #endif | |
6292 case Ctrl_W: /* word under cursor */ | |
6293 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6294 case '_': /* black hole: always empty */ | |
6295 return MCHAR; | |
6296 } | |
6297 | |
6298 #ifdef FEAT_CLIPBOARD | |
6299 regname = may_get_selection(regname); | |
6300 #endif | |
6301 | |
5596 | 6302 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
|
6303 return MAUTO; |
5596 | 6304 |
7 | 6305 get_yank_register(regname, FALSE); |
6306 | |
6307 if (y_current->y_array != NULL) | |
6308 { | |
6309 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6310 *reglen = y_current->y_width; | |
6311 return y_current->y_type; | |
6312 } | |
6313 return MAUTO; | |
6314 } | |
6315 | |
5796 | 6316 /* |
6317 * When "flags" has GREG_LIST return a list with text "s". | |
6318 * Otherwise just return "s". | |
6319 */ | |
6320 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6321 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6322 { |
6323 if (flags & GREG_LIST) | |
6324 { | |
6325 list_T *list = list_alloc(); | |
6326 | |
6327 if (list != NULL) | |
6328 { | |
6329 if (list_append_string(list, NULL, -1) == FAIL) | |
6330 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6331 list_free(list); |
5796 | 6332 return NULL; |
6333 } | |
6334 list->lv_first->li_tv.vval.v_string = s; | |
6335 } | |
6336 return (char_u *)list; | |
6337 } | |
6338 return s; | |
6339 } | |
6340 | |
7 | 6341 /* |
6342 * Return the contents of a register as a single allocated string. | |
6343 * Used for "@r" in expressions and for getreg(). | |
6344 * Returns NULL for error. | |
5796 | 6345 * Flags: |
6346 * GREG_NO_EXPR Do not allow expression register | |
6347 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6348 * not the result of its evaluation. | |
6349 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6350 */ |
6351 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6352 get_reg_contents(int regname, int flags) |
7 | 6353 { |
6354 long i; | |
6355 char_u *retval; | |
6356 int allocated; | |
6357 long len; | |
6358 | |
6359 /* Don't allow using an expression register inside an expression */ | |
6360 if (regname == '=') | |
6361 { | |
5796 | 6362 if (flags & GREG_NO_EXPR) |
6363 return NULL; | |
6364 if (flags & GREG_EXPR_SRC) | |
6365 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6366 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6367 } |
6368 | |
6369 if (regname == '@') /* "@@" is used for unnamed register */ | |
6370 regname = '"'; | |
6371 | |
6372 /* check for valid regname */ | |
6373 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6374 return NULL; | |
6375 | |
6376 #ifdef FEAT_CLIPBOARD | |
6377 regname = may_get_selection(regname); | |
6378 #endif | |
6379 | |
6380 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6381 { | |
6382 if (retval == NULL) | |
6383 return NULL; | |
5796 | 6384 if (allocated) |
6385 return getreg_wrap_one_line(retval, flags); | |
6386 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6387 } |
6388 | |
6389 get_yank_register(regname, FALSE); | |
6390 if (y_current->y_array == NULL) | |
6391 return NULL; | |
6392 | |
5796 | 6393 if (flags & GREG_LIST) |
6394 { | |
6395 list_T *list = list_alloc(); | |
6396 int error = FALSE; | |
6397 | |
6398 if (list == NULL) | |
6399 return NULL; | |
6400 for (i = 0; i < y_current->y_size; ++i) | |
6401 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6402 error = TRUE; | |
6403 if (error) | |
6404 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6405 list_free(list); |
5796 | 6406 return NULL; |
6407 } | |
6408 return (char_u *)list; | |
6409 } | |
6410 | |
7 | 6411 /* |
6412 * Compute length of resulting string. | |
6413 */ | |
6414 len = 0; | |
6415 for (i = 0; i < y_current->y_size; ++i) | |
6416 { | |
6417 len += (long)STRLEN(y_current->y_array[i]); | |
6418 /* | |
6419 * Insert a newline between lines and after last line if | |
6420 * y_type is MLINE. | |
6421 */ | |
6422 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6423 ++len; | |
6424 } | |
6425 | |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6426 retval = alloc(len + 1); |
7 | 6427 |
6428 /* | |
6429 * Copy the lines of the yank register into the string. | |
6430 */ | |
6431 if (retval != NULL) | |
6432 { | |
6433 len = 0; | |
6434 for (i = 0; i < y_current->y_size; ++i) | |
6435 { | |
6436 STRCPY(retval + len, y_current->y_array[i]); | |
6437 len += (long)STRLEN(retval + len); | |
6438 | |
6439 /* | |
6440 * Insert a NL between lines and after the last line if y_type is | |
6441 * MLINE. | |
6442 */ | |
6443 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6444 retval[len++] = '\n'; | |
6445 } | |
6446 retval[len] = NUL; | |
6447 } | |
6448 | |
6449 return retval; | |
6450 } | |
6451 | |
5798 | 6452 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6453 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6454 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6455 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6456 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6457 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6458 int *yank_type UNUSED) |
5798 | 6459 { |
6460 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6461 { | |
6462 emsg_invreg(name); | |
6463 return FAIL; | |
6464 } | |
6465 | |
6466 /* Don't want to change the current (unnamed) register */ | |
6467 *old_y_previous = y_previous; | |
6468 *old_y_current = y_current; | |
6469 | |
6470 get_yank_register(name, TRUE); | |
6471 if (!y_append && !must_append) | |
6472 free_yank_all(); | |
6473 return OK; | |
6474 } | |
6475 | |
6476 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6477 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6478 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6479 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6480 yankreg_T *old_y_current) |
5798 | 6481 { |
6482 # ifdef FEAT_CLIPBOARD | |
6483 /* Send text of clipboard register to the clipboard. */ | |
6484 may_set_selection(); | |
6485 # endif | |
6486 | |
6487 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6488 if (name != '"') | |
6489 y_previous = old_y_previous; | |
6490 y_current = old_y_current; | |
6491 } | |
6492 | |
7 | 6493 /* |
6494 * Store string "str" in register "name". | |
6495 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6496 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6497 * if "name" is an uppercase letter. | |
6498 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6499 * Careful: 'str' is modified, you may have to use a copy! | |
6500 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6501 */ | |
6502 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6503 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6504 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6505 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6506 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6507 int must_append) |
7 | 6508 { |
6509 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6510 } | |
6511 | |
6512 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6513 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6514 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6515 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6516 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6517 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6518 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6519 long block_len) |
5798 | 6520 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6521 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6522 |
6523 if (name == '/' | |
6524 #ifdef FEAT_EVAL | |
6525 || name == '=' | |
6526 #endif | |
6527 ) | |
6528 { | |
6529 char_u *s; | |
6530 | |
6531 if (strings[0] == NULL) | |
6532 s = (char_u *)""; | |
6533 else if (strings[1] != NULL) | |
6534 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6535 emsg(_("E883: search pattern and expression register may not " |
5798 | 6536 "contain two or more lines")); |
6537 return; | |
6538 } | |
6539 else | |
6540 s = strings[0]; | |
6541 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6542 return; | |
6543 } | |
6544 | |
6545 if (name == '_') /* black hole: nothing to do */ | |
6546 return; | |
6547 | |
6548 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6549 &yank_type) == FAIL) | |
6550 return; | |
6551 | |
6552 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6553 | |
6554 finish_write_reg(name, old_y_previous, old_y_current); | |
6555 } | |
6556 | |
6557 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6558 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6559 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6560 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6561 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6562 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6563 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6564 long block_len) |
7 | 6565 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6566 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
|
6567 long len; |
7 | 6568 |
336 | 6569 if (maxlen >= 0) |
6570 len = maxlen; | |
6571 else | |
6572 len = (long)STRLEN(str); | |
6573 | |
7 | 6574 /* Special case: '/' search pattern */ |
6575 if (name == '/') | |
6576 { | |
6577 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
6578 return; | |
6579 } | |
6580 | |
6557 | 6581 if (name == '#') |
6582 { | |
6583 buf_T *buf; | |
6584 | |
6585 if (VIM_ISDIGIT(*str)) | |
6586 { | |
6587 int num = atoi((char *)str); | |
6588 | |
6589 buf = buflist_findnr(num); | |
6590 if (buf == NULL) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6591 semsg(_(e_nobufnr), (long)num); |
6557 | 6592 } |
6593 else | |
6594 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
6595 TRUE, FALSE, FALSE)); | |
6596 if (buf == NULL) | |
6597 return; | |
6598 curwin->w_alt_fnum = buf->b_fnum; | |
6599 return; | |
6600 } | |
6601 | |
336 | 6602 #ifdef FEAT_EVAL |
6603 if (name == '=') | |
6604 { | |
6605 char_u *p, *s; | |
6606 | |
6607 p = vim_strnsave(str, (int)len); | |
6608 if (p == NULL) | |
6609 return; | |
6610 if (must_append) | |
6611 { | |
6612 s = concat_str(get_expr_line_src(), p); | |
6613 vim_free(p); | |
6614 p = s; | |
6615 } | |
6616 set_expr_line(p); | |
6617 return; | |
6618 } | |
6619 #endif | |
6620 | |
7 | 6621 if (name == '_') /* black hole: nothing to do */ |
6622 return; | |
6623 | |
5798 | 6624 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
6625 &yank_type) == FAIL) | |
6626 return; | |
6627 | |
6628 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
6629 | |
6630 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 6631 } |
6632 #endif /* FEAT_EVAL */ | |
6633 | |
6634 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
6635 /* | |
6636 * Put a string into a register. When the register is not empty, the string | |
6637 * is appended. | |
6638 */ | |
6639 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6640 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6641 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
|
6642 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
|
6643 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
|
6644 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6645 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6646 int str_list) /* TRUE if str is char_u ** */ |
7 | 6647 { |
2896 | 6648 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 6649 int lnum; |
6650 long start; | |
6651 long i; | |
6652 int extra; | |
6653 int newlines; /* number of lines added */ | |
6654 int extraline = 0; /* extra line at the end */ | |
6655 int append = FALSE; /* append to last line in register */ | |
6656 char_u *s; | |
5798 | 6657 char_u **ss; |
7 | 6658 char_u **pp; |
6659 long maxlen; | |
6660 | |
2000 | 6661 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 6662 y_ptr->y_size = 0; |
6663 | |
2896 | 6664 if (yank_type == MAUTO) |
5798 | 6665 type = ((str_list || (len > 0 && (str[len - 1] == NL |
6666 || str[len - 1] == CAR))) | |
2896 | 6667 ? MLINE : MCHAR); |
6668 else | |
6669 type = yank_type; | |
6670 | |
7 | 6671 /* |
6672 * Count the number of lines within the string | |
6673 */ | |
6674 newlines = 0; | |
5798 | 6675 if (str_list) |
6676 { | |
6677 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 6678 ++newlines; |
5798 | 6679 } |
6680 else | |
6681 { | |
6682 for (i = 0; i < len; i++) | |
6683 if (str[i] == '\n') | |
6684 ++newlines; | |
6685 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
6686 { | |
6687 extraline = 1; | |
6688 ++newlines; /* count extra newline at the end */ | |
6689 } | |
6690 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
6691 { | |
6692 append = TRUE; | |
6693 --newlines; /* uncount newline when appending first line */ | |
6694 } | |
7 | 6695 } |
6696 | |
6807 | 6697 /* Without any lines make the register empty. */ |
6698 if (y_ptr->y_size + newlines == 0) | |
6699 { | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6700 VIM_CLEAR(y_ptr->y_array); |
6807 | 6701 return; |
6702 } | |
6703 | |
7 | 6704 /* |
6705 * Allocate an array to hold the pointers to the new register lines. | |
6706 * If the register was not empty, move the existing lines to the new array. | |
6707 */ | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6708 pp = lalloc_clear((y_ptr->y_size + newlines) * sizeof(char_u *), TRUE); |
7 | 6709 if (pp == NULL) /* out of memory */ |
6710 return; | |
6711 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
6712 pp[lnum] = y_ptr->y_array[lnum]; | |
6713 vim_free(y_ptr->y_array); | |
6714 y_ptr->y_array = pp; | |
6715 maxlen = 0; | |
6716 | |
6717 /* | |
6718 * Find the end of each line and save it into the array. | |
6719 */ | |
5798 | 6720 if (str_list) |
6721 { | |
6722 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 6723 { |
5856 | 6724 i = (long)STRLEN(*ss); |
5798 | 6725 pp[lnum] = vim_strnsave(*ss, i); |
6726 if (i > maxlen) | |
6727 maxlen = i; | |
7 | 6728 } |
5798 | 6729 } |
6730 else | |
6731 { | |
6732 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 6733 { |
5798 | 6734 for (i = start; i < len; ++i) /* find the end of the line */ |
6735 if (str[i] == '\n') | |
6736 break; | |
6737 i -= start; /* i is now length of line */ | |
6738 if (i > maxlen) | |
6739 maxlen = i; | |
6740 if (append) | |
6741 { | |
6742 --lnum; | |
6743 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
6744 } | |
6745 else | |
6746 extra = 0; | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
6747 s = alloc(i + extra + 1); |
5798 | 6748 if (s == NULL) |
6749 break; | |
6750 if (extra) | |
6751 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
6752 if (append) | |
6753 vim_free(y_ptr->y_array[lnum]); | |
6754 if (i) | |
6755 mch_memmove(s + extra, str + start, (size_t)i); | |
6756 extra += i; | |
6757 s[extra] = NUL; | |
6758 y_ptr->y_array[lnum++] = s; | |
6759 while (--extra >= 0) | |
6760 { | |
6761 if (*s == NUL) | |
6762 *s = '\n'; /* replace NUL with newline */ | |
6763 ++s; | |
6764 } | |
6765 append = FALSE; /* only first line is appended */ | |
7 | 6766 } |
6767 } | |
6768 y_ptr->y_type = type; | |
6769 y_ptr->y_size = lnum; | |
6770 if (type == MBLOCK) | |
6771 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
6772 else | |
6773 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6774 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6775 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
|
6776 #endif |
7 | 6777 } |
6778 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
6779 | |
6780 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6781 clear_oparg(oparg_T *oap) |
7 | 6782 { |
6783 vim_memset(oap, 0, sizeof(oparg_T)); | |
6784 } | |
6785 | |
6786 /* | |
161 | 6787 * Count the number of bytes, characters and "words" in a line. |
7 | 6788 * |
6789 * "Words" are counted by looking for boundaries between non-space and | |
6790 * space characters. (it seems to produce results that match 'wc'.) | |
6791 * | |
161 | 6792 * Return value is byte count; word count for the line is added to "*wc". |
6793 * Char count is added to "*cc". | |
7 | 6794 * |
6795 * The function will only examine the first "limit" characters in the | |
6796 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
6797 * case, eol_size will be added to the character count to account for | |
6798 * the size of the EOL character. | |
6799 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6800 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6801 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6802 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6803 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6804 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6805 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6806 int eol_size) |
7 | 6807 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6808 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6809 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6810 varnumber_T chars = 0; |
7 | 6811 int is_word = 0; |
6812 | |
3626 | 6813 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 6814 { |
6815 if (is_word) | |
6816 { | |
6817 if (vim_isspace(line[i])) | |
6818 { | |
6819 words++; | |
6820 is_word = 0; | |
6821 } | |
6822 } | |
6823 else if (!vim_isspace(line[i])) | |
6824 is_word = 1; | |
161 | 6825 ++chars; |
474 | 6826 i += (*mb_ptr2len)(line + i); |
7 | 6827 } |
6828 | |
6829 if (is_word) | |
6830 words++; | |
6831 *wc += words; | |
6832 | |
6833 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 6834 if (i < limit && line[i] == NUL) |
161 | 6835 { |
7 | 6836 i += eol_size; |
161 | 6837 chars += eol_size; |
6838 } | |
6839 *cc += chars; | |
7 | 6840 return i; |
6841 } | |
6842 | |
6843 /* | |
6844 * Give some info about the position of the cursor (for "g CTRL-G"). | |
6845 * In Visual mode, give some info about the selected region. (In this case, | |
6846 * 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
|
6847 * When "dict" is not NULL store the info there instead of showing it. |
7 | 6848 */ |
6849 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6850 cursor_pos_info(dict_T *dict) |
7 | 6851 { |
6852 char_u *p; | |
274 | 6853 char_u buf1[50]; |
6854 char_u buf2[40]; | |
7 | 6855 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6856 varnumber_T byte_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6857 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6858 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6859 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6860 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6861 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6862 varnumber_T word_count_cursor = 0; |
7 | 6863 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6864 varnumber_T last_check = 100000L; |
7 | 6865 long line_count_selected = 0; |
6866 pos_T min_pos, max_pos; | |
6867 oparg_T oparg; | |
6868 struct block_def bd; | |
6869 | |
6870 /* | |
6871 * Compute the length of the file in characters. | |
6872 */ | |
6873 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
6874 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6875 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6876 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
6877 msg(_(no_lines_msg)); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6878 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6879 } |
7 | 6880 } |
6881 else | |
6882 { | |
6883 if (get_fileformat(curbuf) == EOL_DOS) | |
6884 eol_size = 2; | |
6885 else | |
6886 eol_size = 1; | |
6887 | |
6888 if (VIsual_active) | |
6889 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
6890 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 6891 { |
6892 min_pos = VIsual; | |
6893 max_pos = curwin->w_cursor; | |
6894 } | |
6895 else | |
6896 { | |
6897 min_pos = curwin->w_cursor; | |
6898 max_pos = VIsual; | |
6899 } | |
6900 if (*p_sel == 'e' && max_pos.col > 0) | |
6901 --max_pos.col; | |
6902 | |
6903 if (VIsual_mode == Ctrl_V) | |
6904 { | |
1866 | 6905 #ifdef FEAT_LINEBREAK |
6906 char_u * saved_sbr = p_sbr; | |
6907 | |
6908 /* Make 'sbr' empty for a moment to get the correct size. */ | |
6909 p_sbr = empty_option; | |
6910 #endif | |
7 | 6911 oparg.is_VIsual = 1; |
6912 oparg.block_mode = TRUE; | |
6913 oparg.op_type = OP_NOP; | |
6914 getvcols(curwin, &min_pos, &max_pos, | |
688 | 6915 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 6916 #ifdef FEAT_LINEBREAK |
6917 p_sbr = saved_sbr; | |
6918 #endif | |
688 | 6919 if (curwin->w_curswant == MAXCOL) |
6920 oparg.end_vcol = MAXCOL; | |
7 | 6921 /* Swap the start, end vcol if needed */ |
6922 if (oparg.end_vcol < oparg.start_vcol) | |
6923 { | |
6924 oparg.end_vcol += oparg.start_vcol; | |
6925 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
6926 oparg.end_vcol -= oparg.start_vcol; | |
6927 } | |
6928 } | |
6929 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
6930 } | |
6931 | |
6932 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
6933 { | |
6934 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 6935 if (byte_count > last_check) |
7 | 6936 { |
6937 ui_breakcheck(); | |
6938 if (got_int) | |
6939 return; | |
161 | 6940 last_check = byte_count + 100000L; |
7 | 6941 } |
6942 | |
6943 /* Do extra processing for VIsual mode. */ | |
6944 if (VIsual_active | |
6945 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
6946 { | |
45 | 6947 char_u *s = NULL; |
6948 long len = 0L; | |
6949 | |
7 | 6950 switch (VIsual_mode) |
6951 { | |
6952 case Ctrl_V: | |
6953 virtual_op = virtual_active(); | |
6954 block_prep(&oparg, &bd, lnum, 0); | |
6955 virtual_op = MAYBE; | |
45 | 6956 s = bd.textstart; |
6957 len = (long)bd.textlen; | |
7 | 6958 break; |
6959 case 'V': | |
45 | 6960 s = ml_get(lnum); |
6961 len = MAXCOL; | |
7 | 6962 break; |
6963 case 'v': | |
6964 { | |
6965 colnr_T start_col = (lnum == min_pos.lnum) | |
6966 ? min_pos.col : 0; | |
6967 colnr_T end_col = (lnum == max_pos.lnum) | |
6968 ? max_pos.col - start_col + 1 : MAXCOL; | |
6969 | |
45 | 6970 s = ml_get(lnum) + start_col; |
6971 len = end_col; | |
7 | 6972 } |
6973 break; | |
6974 } | |
45 | 6975 if (s != NULL) |
6976 { | |
161 | 6977 byte_count_cursor += line_count_info(s, &word_count_cursor, |
6978 &char_count_cursor, len, eol_size); | |
45 | 6979 if (lnum == curbuf->b_ml.ml_line_count |
6980 && !curbuf->b_p_eol | |
6933 | 6981 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 6982 && (long)STRLEN(s) < len) |
161 | 6983 byte_count_cursor -= eol_size; |
45 | 6984 } |
7 | 6985 } |
6986 else | |
6987 { | |
6988 /* In non-visual mode, check for the line the cursor is on */ | |
6989 if (lnum == curwin->w_cursor.lnum) | |
6990 { | |
6991 word_count_cursor += word_count; | |
161 | 6992 char_count_cursor += char_count; |
6993 byte_count_cursor = byte_count + | |
6994 line_count_info(ml_get(lnum), | |
6995 &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
|
6996 (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
|
6997 eol_size); |
7 | 6998 } |
6999 } | |
7000 /* Add to the running totals */ | |
161 | 7001 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
|
7002 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7003 eol_size); |
7 | 7004 } |
7005 | |
7006 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7007 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7008 byte_count -= eol_size; |
7 | 7009 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7010 if (dict == NULL) |
7 | 7011 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7012 if (VIsual_active) |
7 | 7013 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7014 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
|
7015 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7016 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
|
7017 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7018 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
|
7019 (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
|
7020 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7021 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7022 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7023 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7024 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
|
7025 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7026 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7027 _("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
|
7028 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7029 (long)curbuf->b_ml.ml_line_count, |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7030 (long_long_T)word_count_cursor, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7031 (long_long_T)word_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7032 (long_long_T)byte_count_cursor, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7033 (long_long_T)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7034 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7035 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7036 _("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
|
7037 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7038 (long)curbuf->b_ml.ml_line_count, |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7039 (long_long_T)word_count_cursor, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7040 (long_long_T)word_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7041 (long_long_T)char_count_cursor, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7042 (long_long_T)char_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7043 (long_long_T)byte_count_cursor, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7044 (long_long_T)byte_count); |
7 | 7045 } |
7046 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7047 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7048 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7049 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7050 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
|
7051 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7052 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
|
7053 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7054 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7055 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
|
7056 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7057 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7058 _("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
|
7059 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7060 (long)curwin->w_cursor.lnum, |
7 | 7061 (long)curbuf->b_ml.ml_line_count, |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7062 (long_long_T)word_count_cursor, (long_long_T)word_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7063 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7064 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7065 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7066 _("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
|
7067 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7068 (long)curwin->w_cursor.lnum, |
161 | 7069 (long)curbuf->b_ml.ml_line_count, |
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7070 (long_long_T)word_count_cursor, (long_long_T)word_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7071 (long_long_T)char_count_cursor, (long_long_T)char_count, |
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7072 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7073 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7074 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7075 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7076 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7077 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7078 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7079 _("(+%lld for BOM)"), (long_long_T)bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7080 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7081 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7082 /* 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
|
7083 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7084 p_shm = (char_u *)""; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
7085 msg((char *)IObuff); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7086 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7087 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7088 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7089 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7090 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7091 { |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7092 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
|
7093 dict_add_number(dict, "chars", char_count); |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7094 dict_add_number(dict, "bytes", byte_count + bom_count); |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7095 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
|
7096 byte_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7097 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
|
7098 char_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7099 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
|
7100 word_count_cursor); |
7 | 7101 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7102 #endif |
7 | 7103 } |