Mercurial > vim
annotate src/ops.c @ 17680:55704f587945 v8.1.1837
patch 8.1.1837: popup test fails if clipboard is supported but not working
commit https://github.com/vim/vim/commit/4999a7fb6585915b53888c930067b33c01674678
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 10 22:21:48 2019 +0200
patch 8.1.1837: popup test fails if clipboard is supported but not working
Problem: Popup test fails if clipboard is supported but not working.
Solution: Add the "clipboard_working" feature. Also use Check commands
instead of "if" and "throw". And remove stray ch_logfile().
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 10 Aug 2019 22:30:05 +0200 |
parents | 9efb4dda9720 |
children | 0f7ae8010787 |
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 |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
68 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
|
69 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
|
70 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 71 #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
|
72 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
|
73 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
74 static int ends_in_white(linenr_T lnum); |
7 | 75 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
76 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 77 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
78 static int fmt_check_par(linenr_T); |
7 | 79 #endif |
80 | |
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
|
81 // 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
|
82 #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
|
83 #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
|
84 |
7 | 85 /* |
86 * The names of operators. | |
87 * 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
|
88 * The third field holds OPF_ flags. |
7 | 89 */ |
90 static char opchars[][3] = | |
91 { | |
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
|
92 {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
|
93 {'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
|
94 {'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
|
95 {'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
|
96 {'<', 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
|
97 {'>', 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
|
98 {'!', 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
|
99 {'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
|
100 {'=', 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
|
101 {'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
|
102 {':', 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
|
103 {'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
|
104 {'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
|
105 {'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
|
106 {'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
|
107 {'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
|
108 {'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
|
109 {'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
|
110 {'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
|
111 {'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
|
112 {'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
|
113 {'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
|
114 {'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
|
115 {'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
|
116 {'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
|
117 {'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
|
118 {'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
|
119 {'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
|
120 {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
|
121 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
7 | 122 }; |
123 | |
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
124 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
125 get_y_regs(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
126 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
127 return y_regs; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
128 } |
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 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
131 get_y_current(void) |
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 return y_current; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
134 } |
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 yankreg_T * |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
137 get_y_previous(void) |
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 return y_previous; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
140 } |
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 void |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
143 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
|
144 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
145 y_previous = yreg; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
146 } |
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 |
7 | 149 /* |
150 * Translate a command name into an operator type. | |
151 * Must only be called with a valid operator name! | |
152 */ | |
153 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
154 get_op_type(int char1, int char2) |
7 | 155 { |
156 int i; | |
157 | |
158 if (char1 == 'r') /* ignore second character */ | |
159 return OP_REPLACE; | |
160 if (char1 == '~') /* when tilde is an operator */ | |
161 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
162 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
|
163 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
164 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
|
165 return OP_NR_SUB; |
7 | 166 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
|
167 { |
7 | 168 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
169 break; | |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
170 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
|
171 { |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
172 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
|
173 break; |
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 } |
7 | 176 return i; |
177 } | |
178 | |
179 /* | |
180 * Return TRUE if operator "op" always works on whole lines. | |
181 */ | |
182 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
183 op_on_lines(int op) |
7 | 184 { |
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
|
185 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
|
186 } |
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
|
187 |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
188 #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
|
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 * 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
|
191 */ |
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 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
|
193 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
|
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 return opchars[op][2] & OPF_CHANGE; |
7 | 196 } |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
197 #endif |
7 | 198 |
199 /* | |
200 * Get first operator command character. | |
201 * Returns 'g' or 'z' if there is another command character. | |
202 */ | |
203 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
204 get_op_char(int optype) |
7 | 205 { |
206 return opchars[optype][0]; | |
207 } | |
208 | |
209 /* | |
210 * Get second operator command character. | |
211 */ | |
212 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
213 get_extra_op_char(int optype) |
7 | 214 { |
215 return opchars[optype][1]; | |
216 } | |
217 | |
218 /* | |
219 * op_shift - handle a shift operation | |
220 */ | |
221 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
222 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 223 { |
224 long i; | |
225 int first_char; | |
226 int block_col = 0; | |
227 | |
228 if (u_save((linenr_T)(oap->start.lnum - 1), | |
229 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
230 return; | |
231 | |
232 if (oap->block_mode) | |
233 block_col = curwin->w_cursor.col; | |
234 | |
235 for (i = oap->line_count; --i >= 0; ) | |
236 { | |
237 first_char = *ml_get_curline(); | |
238 if (first_char == NUL) /* empty line */ | |
239 curwin->w_cursor.col = 0; | |
240 else if (oap->block_mode) | |
241 shift_block(oap, amount); | |
242 else | |
243 /* Move the line right if it doesn't start with '#', 'smartindent' | |
244 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
245 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
246 if (first_char != '#' || !preprocs_left()) | |
247 #endif | |
1516 | 248 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 249 ++curwin->w_cursor.lnum; |
250 } | |
251 | |
252 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
253 if (oap->block_mode) | |
254 { | |
255 curwin->w_cursor.lnum = oap->start.lnum; | |
256 curwin->w_cursor.col = block_col; | |
257 } | |
5735 | 258 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 259 { |
260 curwin->w_cursor.lnum = oap->start.lnum; | |
261 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
262 } | |
263 else | |
264 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
265 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
266 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
267 /* 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
|
268 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
269 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
270 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
271 |
7 | 272 if (oap->line_count > p_report) |
273 { | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
274 char *op; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
275 char *msg_line_single; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
276 char *msg_line_plural; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
277 |
7 | 278 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
|
279 op = ">"; |
7 | 280 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
281 op = "<"; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
282 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
|
283 "%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
|
284 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
|
285 "%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
|
286 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
|
287 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
|
288 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
|
289 msg((char *)IObuff); |
7 | 290 } |
291 | |
292 /* | |
293 * Set "'[" and "']" marks. | |
294 */ | |
295 curbuf->b_op_start = oap->start; | |
296 curbuf->b_op_end.lnum = oap->end.lnum; | |
297 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
298 if (curbuf->b_op_end.col > 0) | |
299 --curbuf->b_op_end.col; | |
300 } | |
301 | |
302 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
303 * 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
|
304 * leaves cursor on first blank in the line. |
7 | 305 */ |
306 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
307 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
308 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
309 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
310 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
311 int call_changed_bytes) /* call changed_bytes() */ |
7 | 312 { |
313 int count; | |
314 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
|
315 int p_sw = (int)get_sw_value_indent(curbuf); |
7 | 316 |
317 count = get_indent(); /* get current indent */ | |
318 | |
319 if (round) /* round off indent */ | |
320 { | |
321 i = count / p_sw; /* number of p_sw rounded down */ | |
322 j = count % p_sw; /* extra spaces */ | |
323 if (j && left) /* first remove extra spaces */ | |
324 --amount; | |
325 if (left) | |
326 { | |
327 i -= amount; | |
328 if (i < 0) | |
329 i = 0; | |
330 } | |
331 else | |
332 i += amount; | |
333 count = i * p_sw; | |
334 } | |
335 else /* original vi indent */ | |
336 { | |
337 if (left) | |
338 { | |
339 count -= p_sw * amount; | |
340 if (count < 0) | |
341 count = 0; | |
342 } | |
343 else | |
344 count += p_sw * amount; | |
345 } | |
346 | |
347 /* Set new indent */ | |
348 if (State & VREPLACE_FLAG) | |
1516 | 349 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 350 else |
1516 | 351 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 352 } |
353 | |
354 /* | |
355 * Shift one line of the current block one shiftwidth right or left. | |
356 * Leaves cursor on first character in block. | |
357 */ | |
358 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
359 shift_block(oparg_T *oap, int amount) |
7 | 360 { |
361 int left = (oap->op_type == OP_LSHIFT); | |
362 int oldstate = State; | |
1839 | 363 int total; |
364 char_u *newp, *oldp; | |
7 | 365 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
|
366 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
|
367 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
368 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
|
369 #endif |
7 | 370 int p_ts = (int)curbuf->b_p_ts; |
371 struct block_def bd; | |
372 int incr; | |
1839 | 373 colnr_T ws_vcol; |
7 | 374 int i = 0, j = 0; |
375 int len; | |
376 #ifdef FEAT_RIGHTLEFT | |
377 int old_p_ri = p_ri; | |
378 | |
4352 | 379 p_ri = 0; /* don't want revins in indent */ |
7 | 380 #endif |
381 | |
382 State = INSERT; /* don't want REPLACE for State */ | |
383 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
384 if (bd.is_short) | |
385 return; | |
386 | |
387 /* 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
|
388 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
|
389 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
|
390 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
391 |
7 | 392 oldp = ml_get_curline(); |
393 | |
394 if (!left) | |
395 { | |
396 /* | |
397 * 1. Get start vcol | |
398 * 2. Total ws vcols | |
399 * 3. Divvy into TABs & spp | |
400 * 4. Construct new string | |
401 */ | |
402 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
403 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
404 if (bd.startspaces) | |
405 { | |
406 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
407 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
408 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
409 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
410 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
411 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
412 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
413 bd.startspaces = 0; |
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 } |
1995 | 416 else |
417 ++bd.textstart; | |
7 | 418 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
419 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 420 { |
5995 | 421 /* TODO: is passing bd.textstart for start of the line OK? */ |
422 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
423 (colnr_T)(bd.start_vcol)); | |
7 | 424 total += incr; |
425 bd.start_vcol += incr; | |
426 } | |
427 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
428 * 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
|
429 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
430 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
|
431 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
|
432 else |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
433 j = total; |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
434 #else |
7 | 435 if (!curbuf->b_p_et) |
436 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
437 if (i) | |
438 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
439 else | |
440 j = total; | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
441 #endif |
7 | 442 /* if we're splitting a TAB, allow for it */ |
443 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
444 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
|
445 newp = alloc(bd.textcol + i + j + len); |
7 | 446 if (newp == NULL) |
447 return; | |
448 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
449 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 450 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
451 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 452 /* the end */ |
453 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
454 } | |
455 else /* left */ | |
456 { | |
1839 | 457 colnr_T destination_col; /* column to which text in block will |
458 be shifted */ | |
459 char_u *verbatim_copy_end; /* end of the part of the line which is | |
460 copied verbatim */ | |
461 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
462 of line */ | |
463 unsigned fill; /* nr of spaces that replace a TAB */ | |
464 unsigned new_line_len; /* the length of the line after the | |
465 block shift */ | |
466 size_t block_space_width; | |
467 size_t shift_amount; | |
468 char_u *non_white = bd.textstart; | |
469 colnr_T non_white_col; | |
470 | |
471 /* | |
472 * Firstly, let's find the first non-whitespace character that is | |
473 * displayed after the block's start column and the character's column | |
474 * number. Also, let's calculate the width of all the whitespace | |
475 * characters that are displayed in the block and precede the searched | |
476 * non-whitespace character. | |
477 */ | |
478 | |
479 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
480 * the part of which is displayed at the block's beginning. Let's start | |
481 * searching from the next character. */ | |
482 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
483 MB_PTR_ADV(non_white); |
1839 | 484 |
485 /* The character's column is in "bd.start_vcol". */ | |
486 non_white_col = bd.start_vcol; | |
487 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
488 while (VIM_ISWHITE(*non_white)) |
7 | 489 { |
5995 | 490 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 491 non_white_col += incr; |
7 | 492 } |
1839 | 493 |
494 block_space_width = non_white_col - oap->start_vcol; | |
495 /* We will shift by "total" or "block_space_width", whichever is less. | |
496 */ | |
1860 | 497 shift_amount = (block_space_width < (size_t)total |
498 ? block_space_width : (size_t)total); | |
1839 | 499 |
500 /* The column to which we will shift the text. */ | |
1860 | 501 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 502 |
503 /* Now let's find out how much of the beginning of the line we can | |
504 * reuse without modification. */ | |
505 verbatim_copy_end = bd.textstart; | |
506 verbatim_copy_width = bd.start_vcol; | |
507 | |
508 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
509 * preceding the block. We have to subtract its width to obtain its | |
510 * column number. */ | |
511 if (bd.startspaces) | |
512 verbatim_copy_width -= bd.start_char_vcols; | |
513 while (verbatim_copy_width < destination_col) | |
7 | 514 { |
5995 | 515 char_u *line = verbatim_copy_end; |
516 | |
517 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
518 incr = lbr_chartabsize(line, verbatim_copy_end, | |
519 verbatim_copy_width); | |
1839 | 520 if (verbatim_copy_width + incr > destination_col) |
521 break; | |
522 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
|
523 MB_PTR_ADV(verbatim_copy_end); |
7 | 524 } |
525 | |
1839 | 526 /* If "destination_col" is different from the width of the initial |
527 * part of the line that will be copied, it means we encountered a tab | |
528 * character, which we will have to partly replace with spaces. */ | |
529 fill = destination_col - verbatim_copy_width; | |
530 | |
531 /* The replacement line will consist of: | |
532 * - the beginning of the original line up to "verbatim_copy_end", | |
533 * - "fill" number of spaces, | |
534 * - the rest of the line, pointed to by non_white. */ | |
535 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
536 + fill | |
537 + (unsigned)STRLEN(non_white) + 1; | |
538 | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
539 newp = alloc(new_line_len); |
7 | 540 if (newp == NULL) |
541 return; | |
1839 | 542 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 543 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 544 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 545 } |
546 /* replace the line */ | |
547 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
548 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
549 State = oldstate; | |
550 curwin->w_cursor.col = oldcol; | |
551 #ifdef FEAT_RIGHTLEFT | |
552 p_ri = old_p_ri; | |
553 #endif | |
554 } | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
555 |
7 | 556 /* |
557 * Insert string "s" (b_insert ? before : after) block :AKelly | |
558 * Caller must prepare for undo. | |
559 */ | |
560 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
561 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
562 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
563 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
564 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
565 struct block_def *bdp) |
7 | 566 { |
567 int p_ts; | |
568 int count = 0; /* extra spaces to replace a cut TAB */ | |
569 int spaces = 0; /* non-zero if cutting a TAB */ | |
570 colnr_T offset; /* pointer along new line */ | |
571 unsigned s_len; /* STRLEN(s) */ | |
572 char_u *newp, *oldp; /* new, old lines */ | |
573 linenr_T lnum; /* loop var */ | |
574 int oldstate = State; | |
575 | |
576 State = INSERT; /* don't want REPLACE for State */ | |
577 s_len = (unsigned)STRLEN(s); | |
578 | |
579 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
580 { | |
581 block_prep(oap, bdp, lnum, TRUE); | |
582 if (bdp->is_short && b_insert) | |
583 continue; /* OP_INSERT, line ends before block start */ | |
584 | |
585 oldp = ml_get(lnum); | |
586 | |
587 if (b_insert) | |
588 { | |
589 p_ts = bdp->start_char_vcols; | |
590 spaces = bdp->startspaces; | |
591 if (spaces != 0) | |
592 count = p_ts - 1; /* we're cutting a TAB */ | |
593 offset = bdp->textcol; | |
594 } | |
595 else /* append */ | |
596 { | |
597 p_ts = bdp->end_char_vcols; | |
598 if (!bdp->is_short) /* spaces = padding after block */ | |
599 { | |
600 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
601 if (spaces != 0) | |
602 count = p_ts - 1; /* we're cutting a TAB */ | |
603 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
604 } | |
605 else /* spaces = padding to block edge */ | |
606 { | |
607 /* if $ used, just append to EOL (ie spaces==0) */ | |
608 if (!bdp->is_MAX) | |
609 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
610 count = spaces; | |
611 offset = bdp->textcol + bdp->textlen; | |
612 } | |
613 } | |
614 | |
6140 | 615 if (has_mbyte && spaces > 0) |
616 { | |
6460 | 617 int off; |
618 | |
6140 | 619 /* Avoid starting halfway a multi-byte character. */ |
620 if (b_insert) | |
621 { | |
6460 | 622 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 623 } |
624 else | |
625 { | |
6460 | 626 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 627 offset += off; |
628 } | |
6460 | 629 spaces -= off; |
630 count -= off; | |
6140 | 631 } |
632 | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
633 newp = alloc(STRLEN(oldp) + s_len + count + 1); |
7 | 634 if (newp == NULL) |
635 continue; | |
636 | |
637 /* copy up to shifted part */ | |
638 mch_memmove(newp, oldp, (size_t)(offset)); | |
639 oldp += offset; | |
640 | |
641 /* insert pre-padding */ | |
6929 | 642 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 643 |
644 /* copy the new text */ | |
645 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
646 offset += s_len; | |
647 | |
648 if (spaces && !bdp->is_short) | |
649 { | |
650 /* insert post-padding */ | |
6929 | 651 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 652 /* We're splitting a TAB, don't copy it. */ |
653 oldp++; | |
654 /* We allowed for that TAB, remember this now */ | |
655 count++; | |
656 } | |
657 | |
658 if (spaces > 0) | |
659 offset += count; | |
1622 | 660 STRMOVE(newp + offset, oldp); |
7 | 661 |
662 ml_replace(lnum, newp, FALSE); | |
663 | |
664 if (lnum == oap->end.lnum) | |
665 { | |
666 /* Set "']" mark to the end of the block instead of the end of | |
667 * the insert in the first line. */ | |
668 curbuf->b_op_end.lnum = oap->end.lnum; | |
669 curbuf->b_op_end.col = offset; | |
670 } | |
671 } /* for all lnum */ | |
672 | |
673 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
674 | |
675 State = oldstate; | |
676 } | |
677 | |
678 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
679 /* | |
680 * op_reindent - handle reindenting a block of lines. | |
681 */ | |
682 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
683 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 684 { |
685 long i; | |
686 char_u *l; | |
6971 | 687 int amount; |
7 | 688 linenr_T first_changed = 0; |
689 linenr_T last_changed = 0; | |
690 linenr_T start_lnum = curwin->w_cursor.lnum; | |
691 | |
216 | 692 /* Don't even try when 'modifiable' is off. */ |
693 if (!curbuf->b_p_ma) | |
694 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
695 emsg(_(e_modifiable)); |
216 | 696 return; |
697 } | |
698 | |
7 | 699 for (i = oap->line_count; --i >= 0 && !got_int; ) |
700 { | |
701 /* it's a slow thing to do, so give feedback so there's no worry that | |
702 * the computer's just hung. */ | |
703 | |
704 if (i > 1 | |
705 && (i % 50 == 0 || i == oap->line_count - 1) | |
706 && 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
|
707 smsg(_("%ld lines to indent... "), i); |
7 | 708 |
709 /* | |
710 * Be vi-compatible: For lisp indenting the first line is not | |
711 * indented, unless there is only one line. | |
712 */ | |
713 #ifdef FEAT_LISP | |
714 if (i != oap->line_count - 1 || oap->line_count == 1 | |
715 || how != get_lisp_indent) | |
716 #endif | |
717 { | |
718 l = skipwhite(ml_get_curline()); | |
719 if (*l == NUL) /* empty or blank line */ | |
6971 | 720 amount = 0; |
7 | 721 else |
6971 | 722 amount = how(); /* get the indent for this line */ |
723 | |
724 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 725 { |
726 /* did change the indent, call changed_lines() later */ | |
727 if (first_changed == 0) | |
728 first_changed = curwin->w_cursor.lnum; | |
729 last_changed = curwin->w_cursor.lnum; | |
730 } | |
731 } | |
732 ++curwin->w_cursor.lnum; | |
1550 | 733 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 734 } |
735 | |
736 /* put cursor on first non-blank of indented line */ | |
737 curwin->w_cursor.lnum = start_lnum; | |
738 beginline(BL_SOL | BL_FIX); | |
739 | |
740 /* Mark changed lines so that they will be redrawn. When Visual | |
741 * highlighting was present, need to continue until the last line. When | |
742 * there is no change still need to remove the Visual highlighting. */ | |
743 if (last_changed != 0) | |
744 changed_lines(first_changed, 0, | |
745 oap->is_VIsual ? start_lnum + oap->line_count : | |
746 last_changed + 1, 0L); | |
747 else if (oap->is_VIsual) | |
748 redraw_curbuf_later(INVERTED); | |
749 | |
750 if (oap->line_count > p_report) | |
751 { | |
752 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
|
753 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
|
754 "%ld lines indented ", i), i); |
7 | 755 } |
756 /* set '[ and '] marks */ | |
757 curbuf->b_op_start = oap->start; | |
758 curbuf->b_op_end = oap->end; | |
759 } | |
760 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
761 | |
762 #if defined(FEAT_EVAL) || defined(PROTO) | |
763 /* | |
764 * Keep the last expression line here, for repeating. | |
765 */ | |
766 static char_u *expr_line = NULL; | |
767 | |
768 /* | |
769 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
770 * Returns '=' when OK, NUL otherwise. | |
771 */ | |
772 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
773 get_expr_register(void) |
7 | 774 { |
775 char_u *new_line; | |
776 | |
17178
40c4cb095d53
patch 8.1.1588: in :let-heredoc line continuation is recognized
Bram Moolenaar <Bram@vim.org>
parents:
17063
diff
changeset
|
777 new_line = getcmdline('=', 0L, 0, TRUE); |
7 | 778 if (new_line == NULL) |
779 return NUL; | |
780 if (*new_line == NUL) /* use previous line */ | |
781 vim_free(new_line); | |
782 else | |
783 set_expr_line(new_line); | |
784 return '='; | |
785 } | |
786 | |
787 /* | |
788 * Set the expression for the '=' register. | |
789 * Argument must be an allocated string. | |
790 */ | |
791 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
792 set_expr_line(char_u *new_line) |
7 | 793 { |
794 vim_free(expr_line); | |
795 expr_line = new_line; | |
796 } | |
797 | |
798 /* | |
799 * Get the result of the '=' register expression. | |
800 * Returns a pointer to allocated memory, or NULL for failure. | |
801 */ | |
802 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
803 get_expr_line(void) |
7 | 804 { |
805 char_u *expr_copy; | |
806 char_u *rv; | |
994 | 807 static int nested = 0; |
7 | 808 |
809 if (expr_line == NULL) | |
810 return NULL; | |
811 | |
812 /* Make a copy of the expression, because evaluating it may cause it to be | |
813 * changed. */ | |
814 expr_copy = vim_strsave(expr_line); | |
815 if (expr_copy == NULL) | |
816 return NULL; | |
817 | |
994 | 818 /* When we are invoked recursively limit the evaluation to 10 levels. |
819 * Then return the string as-is. */ | |
820 if (nested >= 10) | |
821 return expr_copy; | |
822 | |
823 ++nested; | |
714 | 824 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 825 --nested; |
7 | 826 vim_free(expr_copy); |
827 return rv; | |
828 } | |
283 | 829 |
830 /* | |
831 * Get the '=' register expression itself, without evaluating it. | |
832 */ | |
833 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
834 get_expr_line_src(void) |
283 | 835 { |
836 if (expr_line == NULL) | |
837 return NULL; | |
838 return vim_strsave(expr_line); | |
839 } | |
7 | 840 #endif /* FEAT_EVAL */ |
841 | |
842 /* | |
843 * Check if 'regname' is a valid name of a yank register. | |
844 * Note: There is no check for 0 (default register), caller should do this | |
845 */ | |
846 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
847 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
848 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
849 int writing) /* if TRUE check for writable registers */ |
7 | 850 { |
851 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
852 || (!writing && vim_strchr((char_u *) | |
853 #ifdef FEAT_EVAL | |
6557 | 854 "/.%:=" |
7 | 855 #else |
6557 | 856 "/.%:" |
7 | 857 #endif |
858 , regname) != NULL) | |
6557 | 859 || regname == '#' |
7 | 860 || regname == '"' |
861 || regname == '-' | |
862 || regname == '_' | |
863 #ifdef FEAT_CLIPBOARD | |
864 || regname == '*' | |
865 || regname == '+' | |
866 #endif | |
867 #ifdef FEAT_DND | |
868 || (!writing && regname == '~') | |
869 #endif | |
870 ) | |
871 return TRUE; | |
872 return FALSE; | |
873 } | |
874 | |
875 /* | |
876 * Set y_current and y_append, according to the value of "regname". | |
877 * Cannot handle the '_' register. | |
140 | 878 * Must only be called with a valid register name! |
7 | 879 * |
880 * If regname is 0 and writing, use register 0 | |
881 * 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
|
882 * |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
883 * 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
|
884 * clipboard). |
7 | 885 */ |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
886 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
887 get_yank_register(int regname, int writing) |
7 | 888 { |
889 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
|
890 int ret = FALSE; |
7 | 891 |
892 y_append = FALSE; | |
893 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
894 { | |
895 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
|
896 return ret; |
7 | 897 } |
898 i = regname; | |
899 if (VIM_ISDIGIT(i)) | |
900 i -= '0'; | |
901 else if (ASCII_ISLOWER(i)) | |
902 i = CharOrdLow(i) + 10; | |
903 else if (ASCII_ISUPPER(i)) | |
904 { | |
905 i = CharOrdUp(i) + 10; | |
906 y_append = TRUE; | |
907 } | |
908 else if (regname == '-') | |
909 i = DELETION_REGISTER; | |
910 #ifdef FEAT_CLIPBOARD | |
911 /* When selection is not available, use register 0 instead of '*' */ | |
912 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
|
913 { |
7 | 914 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
|
915 ret = TRUE; |
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 /* When clipboard is not available, use register 0 instead of '+' */ |
918 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
|
919 { |
7 | 920 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
|
921 ret = TRUE; |
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 #endif |
924 #ifdef FEAT_DND | |
925 else if (!writing && regname == '~') | |
926 i = TILDE_REGISTER; | |
927 #endif | |
928 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
929 i = 0; | |
930 y_current = &(y_regs[i]); | |
931 if (writing) /* remember the register we write into for do_put() */ | |
932 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
|
933 return ret; |
7 | 934 } |
935 | |
15 | 936 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 937 /* |
938 * When "regname" is a clipboard register, obtain the selection. If it's not | |
939 * available return zero, otherwise return "regname". | |
940 */ | |
15 | 941 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
942 may_get_selection(int regname) |
7 | 943 { |
944 if (regname == '*') | |
945 { | |
946 if (!clip_star.available) | |
947 regname = 0; | |
948 else | |
949 clip_get_selection(&clip_star); | |
950 } | |
951 else if (regname == '+') | |
952 { | |
953 if (!clip_plus.available) | |
954 regname = 0; | |
955 else | |
956 clip_get_selection(&clip_plus); | |
957 } | |
958 return regname; | |
959 } | |
960 #endif | |
961 | |
962 /* | |
963 * Obtain the contents of a "normal" register. The register is made empty. | |
964 * The returned pointer has allocated memory, use put_register() later. | |
965 */ | |
966 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
967 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
968 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
969 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 970 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
971 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
972 int i; |
7 | 973 |
974 #ifdef FEAT_CLIPBOARD | |
975 /* When Visual area changed, may have to update selection. Obtain the | |
976 * selection too. */ | |
1435 | 977 if (name == '*' && clip_star.available) |
7 | 978 { |
3674 | 979 if (clip_isautosel_star()) |
980 clip_update_selection(&clip_star); | |
981 may_get_selection(name); | |
982 } | |
983 if (name == '+' && clip_plus.available) | |
984 { | |
985 if (clip_isautosel_plus()) | |
986 clip_update_selection(&clip_plus); | |
7 | 987 may_get_selection(name); |
988 } | |
989 #endif | |
990 | |
991 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
|
992 reg = ALLOC_ONE(yankreg_T); |
7 | 993 if (reg != NULL) |
994 { | |
995 *reg = *y_current; | |
996 if (copy) | |
997 { | |
998 /* If we run out of memory some or all of the lines are empty. */ | |
999 if (reg->y_size == 0) | |
1000 reg->y_array = NULL; | |
1001 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
|
1002 reg->y_array = ALLOC_MULT(char_u *, reg->y_size); |
7 | 1003 if (reg->y_array != NULL) |
1004 { | |
1005 for (i = 0; i < reg->y_size; ++i) | |
1006 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1007 } | |
1008 } | |
1009 else | |
1010 y_current->y_array = NULL; | |
1011 } | |
1012 return (void *)reg; | |
1013 } | |
1014 | |
1015 /* | |
1451 | 1016 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1017 */ |
1018 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1019 put_register(int name, void *reg) |
7 | 1020 { |
1021 get_yank_register(name, 0); | |
1022 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1023 *y_current = *(yankreg_T *)reg; |
1451 | 1024 vim_free(reg); |
7 | 1025 |
5735 | 1026 #ifdef FEAT_CLIPBOARD |
7 | 1027 /* Send text written to clipboard register to the clipboard. */ |
1028 may_set_selection(); | |
5735 | 1029 #endif |
7 | 1030 } |
4209 | 1031 |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1032 #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
|
1033 || defined(PROTO) |
4209 | 1034 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1035 free_register(void *reg) |
4209 | 1036 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1037 yankreg_T tmp; |
4209 | 1038 |
1039 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1040 *y_current = *(yankreg_T *)reg; |
4209 | 1041 free_yank_all(); |
1042 vim_free(reg); | |
1043 *y_current = tmp; | |
1044 } | |
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1045 #endif |
7 | 1046 |
1047 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1048 /* | |
1049 * return TRUE if the current yank register has type MLINE | |
1050 */ | |
1051 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1052 yank_register_mline(int regname) |
7 | 1053 { |
1054 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1055 return FALSE; | |
1056 if (regname == '_') /* black hole is always empty */ | |
1057 return FALSE; | |
1058 get_yank_register(regname, FALSE); | |
1059 return (y_current->y_type == MLINE); | |
1060 } | |
1061 #endif | |
1062 | |
1063 /* | |
1157 | 1064 * Start or stop recording into a yank register. |
7 | 1065 * |
1157 | 1066 * Return FAIL for failure, OK otherwise. |
7 | 1067 */ |
1068 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1069 do_record(int c) |
7 | 1070 { |
1157 | 1071 char_u *p; |
1072 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1073 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1074 int retval; |
7 | 1075 |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1076 if (reg_recording == 0) /* start recording */ |
7 | 1077 { |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1078 /* registers 0-9, a-z and " are allowed */ |
7 | 1079 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
1080 retval = FAIL; | |
1081 else | |
1082 { | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1083 reg_recording = c; |
7 | 1084 showmode(); |
1085 regname = c; | |
1086 retval = OK; | |
1087 } | |
1088 } | |
1089 else /* stop recording */ | |
1090 { | |
1091 /* | |
1157 | 1092 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1093 * needs to be removed again to put it in a register. exec_reg then | |
1094 * adds the escaping back later. | |
7 | 1095 */ |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1096 reg_recording = 0; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
1097 msg(""); |
7 | 1098 p = get_recorded(); |
1099 if (p == NULL) | |
1100 retval = FAIL; | |
1101 else | |
1102 { | |
1081 | 1103 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1104 vim_unescape_csi(p); | |
1105 | |
7 | 1106 /* |
1107 * We don't want to change the default register here, so save and | |
1108 * restore the current register name. | |
1109 */ | |
1110 old_y_previous = y_previous; | |
1111 old_y_current = y_current; | |
1112 | |
1113 retval = stuff_yank(regname, p); | |
1114 | |
1115 y_previous = old_y_previous; | |
1116 y_current = old_y_current; | |
1117 } | |
1118 } | |
1119 return retval; | |
1120 } | |
1121 | |
1122 /* | |
1123 * Stuff string "p" into yank register "regname" as a single line (append if | |
1124 * uppercase). "p" must have been alloced. | |
1125 * | |
1126 * return FAIL for failure, OK otherwise | |
1127 */ | |
1128 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1129 stuff_yank(int regname, char_u *p) |
7 | 1130 { |
1131 char_u *lp; | |
1132 char_u **pp; | |
1133 | |
1134 /* check for read-only register */ | |
1135 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1136 { | |
1137 vim_free(p); | |
1138 return FAIL; | |
1139 } | |
1140 if (regname == '_') /* black hole: don't do anything */ | |
1141 { | |
1142 vim_free(p); | |
1143 return OK; | |
1144 } | |
1145 get_yank_register(regname, TRUE); | |
1146 if (y_append && y_current->y_array != NULL) | |
1147 { | |
1148 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
|
1149 lp = alloc(STRLEN(*pp) + STRLEN(p) + 1); |
7 | 1150 if (lp == NULL) |
1151 { | |
1152 vim_free(p); | |
1153 return FAIL; | |
1154 } | |
1155 STRCPY(lp, *pp); | |
1156 STRCAT(lp, p); | |
1157 vim_free(p); | |
1158 vim_free(*pp); | |
1159 *pp = lp; | |
1160 } | |
1161 else | |
1162 { | |
1163 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
|
1164 if ((y_current->y_array = ALLOC_ONE(char_u *)) == NULL) |
7 | 1165 { |
1166 vim_free(p); | |
1167 return FAIL; | |
1168 } | |
1169 y_current->y_array[0] = p; | |
1170 y_current->y_size = 1; | |
1171 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
|
1172 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1173 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
|
1174 #endif |
7 | 1175 } |
1176 return OK; | |
1177 } | |
1178 | |
1893 | 1179 static int execreg_lastc = NUL; |
1180 | |
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1181 int |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1182 get_execreg_lastc(void) |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1183 { |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1184 return execreg_lastc; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1185 } |
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 void |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1188 set_execreg_lastc(int lastc) |
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 execreg_lastc = lastc; |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1191 } |
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
17178
diff
changeset
|
1192 |
7 | 1193 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1194 * Execute a yank register: copy it into the stuff buffer. |
7 | 1195 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1196 * Return FAIL for failure, OK otherwise. |
7 | 1197 */ |
1198 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1199 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1200 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1201 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1202 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
|
1203 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1204 { |
1205 long i; | |
1206 char_u *p; | |
1207 int retval = OK; | |
1208 int remap; | |
1209 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1210 // repeat previous one |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1211 if (regname == '@') |
168 | 1212 { |
1893 | 1213 if (execreg_lastc == NUL) |
168 | 1214 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1215 emsg(_("E748: No previously used register")); |
168 | 1216 return FAIL; |
1217 } | |
1893 | 1218 regname = execreg_lastc; |
168 | 1219 } |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1220 // check for valid regname |
7 | 1221 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) |
168 | 1222 { |
1223 emsg_invreg(regname); | |
7 | 1224 return FAIL; |
168 | 1225 } |
1893 | 1226 execreg_lastc = regname; |
7 | 1227 |
1228 #ifdef FEAT_CLIPBOARD | |
1229 regname = may_get_selection(regname); | |
1230 #endif | |
1231 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1232 // 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
|
1233 if (regname == '_') |
7 | 1234 return OK; |
1235 | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1236 // 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
|
1237 if (regname == ':') |
7 | 1238 { |
1239 if (last_cmdline == NULL) | |
1240 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1241 emsg(_(e_nolastcmd)); |
7 | 1242 return FAIL; |
1243 } | |
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1244 // don't keep the cmdline containing @: |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1245 VIM_CLEAR(new_last_cmdline); |
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1246 // Escape all control characters with a CTRL-V |
16 | 1247 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
|
1248 (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
|
1249 "\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
|
1250 "\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
|
1251 "\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
|
1252 Ctrl_V, FALSE); |
16 | 1253 if (p != NULL) |
480 | 1254 { |
1255 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1256 * Remove it when it's already there. */ | |
1257 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1258 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1259 else |
1077 | 1260 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1261 } |
16 | 1262 vim_free(p); |
7 | 1263 } |
1264 #ifdef FEAT_EVAL | |
1265 else if (regname == '=') | |
1266 { | |
1267 p = get_expr_line(); | |
1268 if (p == NULL) | |
1269 return FAIL; | |
1077 | 1270 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1271 vim_free(p); |
1272 } | |
1273 #endif | |
1274 else if (regname == '.') /* use last inserted text */ | |
1275 { | |
1276 p = get_last_insert_save(); | |
1277 if (p == NULL) | |
1278 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1279 emsg(_(e_noinstext)); |
7 | 1280 return FAIL; |
1281 } | |
1077 | 1282 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1283 vim_free(p); |
1284 } | |
1285 else | |
1286 { | |
1287 get_yank_register(regname, FALSE); | |
1288 if (y_current->y_array == NULL) | |
1289 return FAIL; | |
1290 | |
1291 /* Disallow remaping for ":@r". */ | |
1292 remap = colon ? REMAP_NONE : REMAP_YES; | |
1293 | |
1294 /* | |
1295 * Insert lines into typeahead buffer, from last one to first one. | |
1296 */ | |
1034 | 1297 put_reedit_in_typebuf(silent); |
7 | 1298 for (i = y_current->y_size; --i >= 0; ) |
1299 { | |
1077 | 1300 char_u *escaped; |
1301 | |
7 | 1302 /* insert NL between lines and after last line if type is MLINE */ |
1303 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1304 || addcr) | |
1305 { | |
1034 | 1306 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1307 return FAIL; |
1308 } | |
1077 | 1309 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1310 if (escaped == NULL) | |
1311 return FAIL; | |
1312 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1313 vim_free(escaped); | |
1314 if (retval == FAIL) | |
7 | 1315 return FAIL; |
1034 | 1316 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1317 == FAIL) |
1318 return FAIL; | |
1319 } | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1320 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
7 | 1321 } |
1322 return retval; | |
1323 } | |
1324 | |
1325 /* | |
1326 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1327 * used only after other typeahead has been processed. | |
1328 */ | |
1329 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1330 put_reedit_in_typebuf(int silent) |
7 | 1331 { |
1332 char_u buf[3]; | |
1333 | |
1334 if (restart_edit != NUL) | |
1335 { | |
1336 if (restart_edit == 'V') | |
1337 { | |
1338 buf[0] = 'g'; | |
1339 buf[1] = 'R'; | |
1340 buf[2] = NUL; | |
1341 } | |
1342 else | |
1343 { | |
1344 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1345 buf[1] = NUL; | |
1346 } | |
1034 | 1347 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1348 restart_edit = NUL; |
1349 } | |
1350 } | |
1351 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1352 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 * 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
|
1354 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1355 * 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
|
1356 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1357 */ |
7 | 1358 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1359 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1360 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1361 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1362 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1363 int silent) |
7 | 1364 { |
1365 int retval = OK; | |
1366 | |
1034 | 1367 put_reedit_in_typebuf(silent); |
7 | 1368 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1369 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1370 if (retval == OK) |
1077 | 1371 { |
1372 char_u *p; | |
1373 | |
1374 if (esc) | |
1375 p = vim_strsave_escape_csi(s); | |
1376 else | |
1377 p = s; | |
1378 if (p == NULL) | |
1379 retval = FAIL; | |
1380 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1381 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
|
1382 0, TRUE, silent); |
1077 | 1383 if (esc) |
1384 vim_free(p); | |
1385 } | |
7 | 1386 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1387 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1388 return retval; |
1389 } | |
1390 | |
1391 /* | |
1392 * Insert a yank register: copy it into the Read buffer. | |
1393 * Used by CTRL-R command and middle mouse button in insert mode. | |
1394 * | |
1395 * return FAIL for failure, OK otherwise | |
1396 */ | |
1397 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1398 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1399 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
|
1400 int literally_arg) /* insert literally, not as if typed */ |
7 | 1401 { |
1402 long i; | |
1403 int retval = OK; | |
1404 char_u *arg; | |
1405 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
|
1406 int literally = literally_arg; |
7 | 1407 |
1408 /* | |
1409 * It is possible to get into an endless loop by having CTRL-R a in | |
1410 * register a and then, in insert mode, doing CTRL-R a. | |
1411 * If you hit CTRL-C, the loop will be broken here. | |
1412 */ | |
1413 ui_breakcheck(); | |
1414 if (got_int) | |
1415 return FAIL; | |
1416 | |
1417 /* check for valid regname */ | |
1418 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1419 return FAIL; | |
1420 | |
1421 #ifdef FEAT_CLIPBOARD | |
1422 regname = may_get_selection(regname); | |
1423 #endif | |
1424 | |
1425 if (regname == '.') /* insert last inserted text */ | |
1426 retval = stuff_inserted(NUL, 1L, TRUE); | |
1427 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1428 { | |
1429 if (arg == NULL) | |
1430 return FAIL; | |
1431 stuffescaped(arg, literally); | |
1432 if (allocated) | |
1433 vim_free(arg); | |
1434 } | |
1435 else /* name or number register */ | |
1436 { | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1437 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
|
1438 literally = TRUE; |
7 | 1439 if (y_current->y_array == NULL) |
1440 retval = FAIL; | |
1441 else | |
1442 { | |
1443 for (i = 0; i < y_current->y_size; ++i) | |
1444 { | |
1445 stuffescaped(y_current->y_array[i], literally); | |
1446 /* | |
1447 * Insert a newline between lines and after last line if | |
1448 * y_type is MLINE. | |
1449 */ | |
1450 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1451 stuffcharReadbuff('\n'); | |
1452 } | |
1453 } | |
1454 } | |
1455 | |
1456 return retval; | |
1457 } | |
1458 | |
1459 /* | |
1460 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1461 * literally ("literally" TRUE) or interpret is as typed characters. | |
1462 */ | |
1463 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1464 stuffescaped(char_u *arg, int literally) |
7 | 1465 { |
1466 int c; | |
1467 char_u *start; | |
1468 | |
1469 while (*arg != NUL) | |
1470 { | |
1471 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1472 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1473 * is TRUE. */ | |
1474 start = arg; | |
1475 while ((*arg >= ' ' | |
1476 #ifndef EBCDIC | |
1477 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1478 #endif | |
1479 ) | |
1480 || (*arg == K_SPECIAL && !literally)) | |
1481 ++arg; | |
1482 if (arg > start) | |
1483 stuffReadbuffLen(start, (long)(arg - start)); | |
1484 | |
1485 /* stuff a single special character */ | |
1486 if (*arg != NUL) | |
1487 { | |
1488 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
|
1489 c = mb_cptr2char_adv(&arg); |
7 | 1490 else |
1491 c = *arg++; | |
1492 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1493 stuffcharReadbuff(Ctrl_V); | |
1494 stuffcharReadbuff(c); | |
1495 } | |
1496 } | |
1497 } | |
1498 | |
1499 /* | |
1157 | 1500 * If "regname" is a special register, return TRUE and store a pointer to its |
1501 * value in "argp". | |
7 | 1502 */ |
15 | 1503 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1504 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1505 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1506 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1507 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
|
1508 int errmsg) /* give error message when failing */ |
7 | 1509 { |
1510 int cnt; | |
1511 | |
1512 *argp = NULL; | |
1513 *allocated = FALSE; | |
1514 switch (regname) | |
1515 { | |
1516 case '%': /* file name */ | |
1517 if (errmsg) | |
1518 check_fname(); /* will give emsg if not set */ | |
1519 *argp = curbuf->b_fname; | |
1520 return TRUE; | |
1521 | |
1522 case '#': /* alternate file name */ | |
1523 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1524 return TRUE; | |
1525 | |
1526 #ifdef FEAT_EVAL | |
1527 case '=': /* result of expression */ | |
1528 *argp = get_expr_line(); | |
1529 *allocated = TRUE; | |
1530 return TRUE; | |
1531 #endif | |
1532 | |
1533 case ':': /* last command line */ | |
1534 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
|
1535 emsg(_(e_nolastcmd)); |
7 | 1536 *argp = last_cmdline; |
1537 return TRUE; | |
1538 | |
1539 case '/': /* last search-pattern */ | |
1540 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
|
1541 emsg(_(e_noprevre)); |
7 | 1542 *argp = last_search_pat(); |
1543 return TRUE; | |
1544 | |
1545 case '.': /* last inserted text */ | |
1546 *argp = get_last_insert_save(); | |
1547 *allocated = TRUE; | |
1548 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
|
1549 emsg(_(e_noinstext)); |
7 | 1550 return TRUE; |
1551 | |
1552 #ifdef FEAT_SEARCHPATH | |
1553 case Ctrl_F: /* Filename under cursor */ | |
1554 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1555 if (!errmsg) | |
1556 return FALSE; | |
1557 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1558 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1559 *allocated = TRUE; |
1560 return TRUE; | |
1561 #endif | |
1562 | |
1563 case Ctrl_W: /* word under cursor */ | |
1564 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1565 if (!errmsg) | |
1566 return FALSE; | |
1567 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1568 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1569 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1570 *allocated = TRUE; | |
1571 return TRUE; | |
1572 | |
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1573 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
|
1574 if (!errmsg) |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1575 return FALSE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1576 |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1577 *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
|
1578 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
|
1579 return TRUE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 |
7 | 1581 case '_': /* black hole: always empty */ |
1582 *argp = (char_u *)""; | |
1583 return TRUE; | |
1584 } | |
1585 | |
1586 return FALSE; | |
1587 } | |
1588 | |
1589 /* | |
15 | 1590 * Paste a yank register into the command line. |
1591 * Only for non-special registers. | |
1592 * Used by CTRL-R command in command-line mode | |
7 | 1593 * insert_reg() can't be used here, because special characters from the |
1594 * register contents will be interpreted as commands. | |
1595 * | |
1596 * return FAIL for failure, OK otherwise | |
1597 */ | |
1598 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1599 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1600 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
|
1601 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
|
1602 int remcr) /* don't add CR characters */ |
7 | 1603 { |
1604 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
|
1605 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
|
1606 |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1607 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
|
1608 literally = TRUE; |
7 | 1609 if (y_current->y_array == NULL) |
1610 return FAIL; | |
1611 | |
1612 for (i = 0; i < y_current->y_size; ++i) | |
1613 { | |
1614 cmdline_paste_str(y_current->y_array[i], literally); | |
1615 | |
1015 | 1616 /* 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
|
1617 * 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
|
1618 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1619 cmdline_paste_str((char_u *)"\r", literally); |
1620 | |
1621 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1622 * lines and gets bored. */ | |
1623 ui_breakcheck(); | |
1624 if (got_int) | |
1625 return FAIL; | |
1626 } | |
1627 return OK; | |
1628 } | |
1629 | |
1630 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1631 /* | |
1632 * Adjust the register name pointed to with "rp" for the clipboard being | |
1633 * used always and the clipboard being available. | |
1634 */ | |
1635 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1636 adjust_clip_reg(int *rp) |
7 | 1637 { |
2654 | 1638 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1639 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1640 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1641 { | |
1642 if (clip_unnamed != 0) | |
1643 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1644 ? '+' : '*'; |
6116 | 1645 else |
1646 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1647 ? '+' : '*'; | |
1648 } | |
7 | 1649 if (!clip_star.available && *rp == '*') |
1650 *rp = 0; | |
1651 if (!clip_plus.available && *rp == '+') | |
1652 *rp = 0; | |
1653 } | |
1654 #endif | |
1655 | |
1656 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1657 * 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
|
1658 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1659 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1660 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
|
1661 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1662 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1664 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
|
1665 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
|
1666 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
|
1667 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
|
1668 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
|
1669 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
|
1670 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
|
1671 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
|
1672 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1673 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1674 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1675 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1676 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
|
1677 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1678 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1680 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 return; |
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 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
|
1689 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 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
|
1691 if (list == NULL) |
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1692 return; |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 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
|
1694 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
|
1695 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 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
|
1697 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1698 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
|
1699 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
|
1700 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
|
1701 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 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
|
1703 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
|
1704 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
|
1705 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
|
1706 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1707 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1708 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 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
|
1710 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 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
|
1712 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
|
1713 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 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
|
1715 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1716 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 } |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1718 dict_add_string(v_event, "regtype", buf); |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1719 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 /* 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
|
1721 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
|
1722 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1723 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1724 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1725 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
|
1726 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 /* 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
|
1730 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 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
|
1732 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1733 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1734 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1735 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1736 * Handle a delete operation. |
7 | 1737 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1738 * Return FAIL if undo failed, OK otherwise. |
7 | 1739 */ |
1740 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1741 op_delete(oparg_T *oap) |
7 | 1742 { |
1743 int n; | |
1744 linenr_T lnum; | |
1745 char_u *ptr; | |
1746 char_u *newp, *oldp; | |
1747 struct block_def bd; | |
1748 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1749 int did_yank = FALSE; | |
1750 | |
1751 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1752 return OK; | |
1753 | |
1754 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1755 if (oap->empty) | |
1756 return u_save_cursor(); | |
1757 | |
1758 if (!curbuf->b_p_ma) | |
1759 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1760 emsg(_(e_modifiable)); |
7 | 1761 return FAIL; |
1762 } | |
1763 | |
1764 #ifdef FEAT_CLIPBOARD | |
1765 adjust_clip_reg(&oap->regname); | |
1766 #endif | |
1767 | |
1768 if (has_mbyte) | |
1769 mb_adjust_opend(oap); | |
1770 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1771 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1772 * 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
|
1773 * 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
|
1774 * 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
|
1775 */ |
7 | 1776 if ( oap->motion_type == MCHAR |
1777 && !oap->is_VIsual | |
50 | 1778 && !oap->block_mode |
7 | 1779 && oap->line_count > 1 |
3254 | 1780 && oap->motion_force == NUL |
7 | 1781 && oap->op_type == OP_DELETE) |
1782 { | |
2957 | 1783 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1784 if (*ptr != NUL) | |
1785 ptr += oap->inclusive; | |
7 | 1786 ptr = skipwhite(ptr); |
1787 if (*ptr == NUL && inindent(0)) | |
1788 oap->motion_type = MLINE; | |
1789 } | |
1790 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1791 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1792 * 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
|
1793 * 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
|
1794 */ |
7 | 1795 if ( oap->motion_type == MCHAR |
1796 && oap->line_count == 1 | |
1797 && oap->op_type == OP_DELETE | |
1798 && *ml_get(oap->start.lnum) == NUL) | |
1799 { | |
1800 /* | |
446 | 1801 * It's an error to operate on an empty region, when 'E' included in |
7 | 1802 * 'cpoptions' (Vi compatible). |
1803 */ | |
446 | 1804 if (virtual_op) |
1805 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1806 * marks as if it happened. */ | |
1807 goto setmarks; | |
7 | 1808 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1809 beep_flush(); | |
1810 return OK; | |
1811 } | |
1812 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1813 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1814 * 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
|
1815 * 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
|
1816 * 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
|
1817 */ |
7 | 1818 if (oap->regname != '_') |
1819 { | |
1820 if (oap->regname != 0) | |
1821 { | |
1822 /* check for read-only register */ | |
1823 if (!valid_yank_reg(oap->regname, TRUE)) | |
1824 { | |
1825 beep_flush(); | |
1826 return OK; | |
1827 } | |
1828 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1829 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1830 did_yank = TRUE; | |
1831 } | |
1832 | |
1833 /* | |
1834 * 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
|
1835 * 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
|
1836 * compatible) |
3782 | 1837 * Use the register name from before adjust_clip_reg() may have |
1838 * changed it. | |
7 | 1839 */ |
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1840 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
|
1841 || oap->use_reg_one) |
7 | 1842 { |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1843 shift_delete_registers(); |
7 | 1844 if (op_yank(oap, TRUE, FALSE) == OK) |
1845 did_yank = TRUE; | |
1846 } | |
1847 | |
3468 | 1848 /* Yank into small delete register when no named register specified |
1849 * and the delete is within one line. */ | |
1850 if (( | |
1851 #ifdef FEAT_CLIPBOARD | |
3584 | 1852 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1853 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1854 #endif |
1855 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1856 && oap->line_count == 1) |
1857 { | |
1858 oap->regname = '-'; | |
1859 get_yank_register(oap->regname, TRUE); | |
1860 if (op_yank(oap, TRUE, FALSE) == OK) | |
1861 did_yank = TRUE; | |
1862 oap->regname = 0; | |
1863 } | |
1864 | |
1865 /* | |
1866 * If there's too much stuff to fit in the yank register, then get a | |
1867 * confirmation before doing the delete. This is crude, but simple. | |
1868 * And it avoids doing a delete of something we can't put back if we | |
1869 * want. | |
1870 */ | |
1871 if (!did_yank) | |
1872 { | |
1873 int msg_silent_save = msg_silent; | |
1874 | |
1875 msg_silent = 0; /* must display the prompt */ | |
1876 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1877 msg_silent = msg_silent_save; | |
1878 if (n != 'y') | |
1879 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1880 emsg(_(e_abort)); |
7 | 1881 return FAIL; |
1882 } | |
1883 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1884 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1885 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1886 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1887 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
|
1888 #endif |
7 | 1889 } |
1890 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1891 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1892 * 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
|
1893 */ |
7 | 1894 if (oap->block_mode) |
1895 { | |
1896 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1897 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1898 return FAIL; | |
1899 | |
1900 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1901 { | |
1902 block_prep(oap, &bd, lnum, TRUE); | |
1903 if (bd.textlen == 0) /* nothing to delete */ | |
1904 continue; | |
1905 | |
1906 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1907 if (lnum == curwin->w_cursor.lnum) | |
1908 { | |
1909 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1910 curwin->w_cursor.coladd = 0; | |
1911 } | |
1912 | |
16682
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1913 // "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
|
1914 // 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
|
1915 // Thus the number of characters may increase! |
7 | 1916 n = bd.textlen - bd.startspaces - bd.endspaces; |
1917 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
|
1918 newp = alloc(STRLEN(oldp) + 1 - n); |
7 | 1919 if (newp == NULL) |
1920 continue; | |
1921 /* copy up to deleted part */ | |
1922 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1923 /* insert spaces */ | |
6929 | 1924 vim_memset(newp + bd.textcol, ' ', |
7 | 1925 (size_t)(bd.startspaces + bd.endspaces)); |
1926 /* copy the part after the deleted part */ | |
1927 oldp += bd.textcol + bd.textlen; | |
1622 | 1928 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1929 /* replace the line */ |
1930 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
|
1931 |
7847d281cbbf
patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents:
16680
diff
changeset
|
1932 #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
|
1933 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
|
1934 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
|
1935 #endif |
7 | 1936 } |
1937 | |
1938 check_cursor_col(); | |
1939 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1940 oap->end.lnum + 1, 0L); | |
1941 oap->line_count = 0; /* no lines deleted */ | |
1942 } | |
5735 | 1943 else if (oap->motion_type == MLINE) |
7 | 1944 { |
1945 if (oap->op_type == OP_CHANGE) | |
1946 { | |
1947 /* Delete the lines except the first one. Temporarily move the | |
1948 * cursor to the next line. Save the current line number, if the | |
1949 * last line is deleted it may be changed. | |
1950 */ | |
1951 if (oap->line_count > 1) | |
1952 { | |
1953 lnum = curwin->w_cursor.lnum; | |
1954 ++curwin->w_cursor.lnum; | |
1955 del_lines((long)(oap->line_count - 1), TRUE); | |
1956 curwin->w_cursor.lnum = lnum; | |
1957 } | |
1958 if (u_save_cursor() == FAIL) | |
1959 return FAIL; | |
1960 if (curbuf->b_p_ai) /* don't delete indent */ | |
1961 { | |
1962 beginline(BL_WHITE); /* cursor on first non-white */ | |
1963 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1964 ai_col = curwin->w_cursor.col; | |
1965 } | |
1966 else | |
1967 beginline(0); /* cursor in column 0 */ | |
1968 truncate_line(FALSE); /* delete the rest of the line */ | |
1969 /* leave cursor past last char in line */ | |
1970 if (oap->line_count > 1) | |
1971 u_clearline(); /* "U" command not possible after "2cc" */ | |
1972 } | |
1973 else | |
1974 { | |
1975 del_lines(oap->line_count, TRUE); | |
1976 beginline(BL_WHITE | BL_FIX); | |
1977 u_clearline(); /* "U" command not possible after "dd" */ | |
1978 } | |
1979 } | |
1980 else | |
1981 { | |
1982 if (virtual_op) | |
1983 { | |
1984 int endcol = 0; | |
1985 | |
1986 /* For virtualedit: break the tabs that are partly included. */ | |
1987 if (gchar_pos(&oap->start) == '\t') | |
1988 { | |
1989 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1990 return FAIL; | |
1991 if (oap->line_count == 1) | |
1992 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1993 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1994 oap->start = curwin->w_cursor; | |
1995 if (oap->line_count == 1) | |
1996 { | |
1997 coladvance(endcol); | |
1998 oap->end.col = curwin->w_cursor.col; | |
1999 oap->end.coladd = curwin->w_cursor.coladd; | |
2000 curwin->w_cursor = oap->start; | |
2001 } | |
2002 } | |
2003 | |
2004 /* Break a tab only when it's included in the area. */ | |
2005 if (gchar_pos(&oap->end) == '\t' | |
2006 && (int)oap->end.coladd < oap->inclusive) | |
2007 { | |
2008 /* save last line for undo */ | |
2009 if (u_save((linenr_T)(oap->end.lnum - 1), | |
2010 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2011 return FAIL; | |
2012 curwin->w_cursor = oap->end; | |
2013 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
2014 oap->end = curwin->w_cursor; | |
2015 curwin->w_cursor = oap->start; | |
2016 } | |
2017 } | |
2018 | |
2019 if (oap->line_count == 1) /* delete characters within one line */ | |
2020 { | |
2021 if (u_save_cursor() == FAIL) /* save line for undo */ | |
2022 return FAIL; | |
2023 | |
2024 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2025 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2026 && oap->op_type == OP_CHANGE |
2027 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2028 && !oap->is_VIsual) |
7 | 2029 display_dollar(oap->end.col - !oap->inclusive); |
2030 | |
2031 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2032 | |
2033 if (virtual_op) | |
2034 { | |
2035 /* fix up things for virtualedit-delete: | |
2036 * break the tabs which are going to get in our way | |
2037 */ | |
2038 char_u *curline = ml_get_curline(); | |
2039 int len = (int)STRLEN(curline); | |
2040 | |
2041 if (oap->end.coladd != 0 | |
2042 && (int)oap->end.col >= len - 1 | |
2043 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2044 n++; | |
2045 /* Delete at least one char (e.g, when on a control char). */ | |
2046 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2047 n = 1; | |
2048 | |
2049 /* When deleted a char in the line, reset coladd. */ | |
2050 if (gchar_cursor() != NUL) | |
2051 curwin->w_cursor.coladd = 0; | |
2052 } | |
6826 | 2053 (void)del_bytes((long)n, !virtual_op, |
2054 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2055 } |
2056 else /* delete characters between lines */ | |
2057 { | |
2058 pos_T curpos; | |
2059 | |
2060 /* save deleted and changed lines for undo */ | |
2061 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2062 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2063 return FAIL; | |
2064 | |
2065 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2066 | |
2067 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2068 ++curwin->w_cursor.lnum; | |
2069 del_lines((long)(oap->line_count - 2), FALSE); | |
2070 | |
6826 | 2071 /* delete from start of line until op_end */ |
2957 | 2072 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2073 curwin->w_cursor.col = 0; |
2074 (void)del_bytes((long)n, !virtual_op, | |
2075 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2076 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2077 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2078 } |
2079 } | |
2080 | |
2081 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2082 | |
446 | 2083 setmarks: |
7 | 2084 if (oap->block_mode) |
2085 { | |
2086 curbuf->b_op_end.lnum = oap->end.lnum; | |
2087 curbuf->b_op_end.col = oap->start.col; | |
2088 } | |
2089 else | |
2090 curbuf->b_op_end = oap->start; | |
2091 curbuf->b_op_start = oap->start; | |
2092 | |
2093 return OK; | |
2094 } | |
2095 | |
2096 /* | |
2097 * Adjust end of operating area for ending on a multi-byte character. | |
2098 * Used for deletion. | |
2099 */ | |
2100 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2101 mb_adjust_opend(oparg_T *oap) |
7 | 2102 { |
2103 char_u *p; | |
2104 | |
2105 if (oap->inclusive) | |
2106 { | |
2107 p = ml_get(oap->end.lnum); | |
2108 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2109 } | |
2110 } | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
2111 |
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
|
2112 /* |
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
|
2113 * 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
|
2114 * 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
|
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 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
|
2117 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
|
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 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
|
2120 |
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 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
|
2122 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
|
2123 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
|
2124 /* 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
|
2125 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
|
2126 } |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2127 |
7 | 2128 /* |
2129 * Replace a whole area with one character. | |
2130 */ | |
2131 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2132 op_replace(oparg_T *oap, int c) |
7 | 2133 { |
2134 int n, numc; | |
2135 int num_chars; | |
2136 char_u *newp, *oldp; | |
2137 size_t oldlen; | |
2138 struct block_def bd; | |
5428 | 2139 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
|
2140 int had_ctrl_v_cr = FALSE; |
7 | 2141 |
2142 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2143 return OK; /* nothing to do */ | |
2144 | |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2145 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
|
2146 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2147 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
|
2148 c = CAR; |
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 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
|
2151 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2152 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
|
2153 c = NL; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2154 } |
5428 | 2155 |
7 | 2156 if (has_mbyte) |
2157 mb_adjust_opend(oap); | |
2158 | |
2159 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2160 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2161 return FAIL; | |
2162 | |
2163 /* | |
2164 * block mode replace | |
2165 */ | |
2166 if (oap->block_mode) | |
2167 { | |
2168 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2169 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2170 { | |
1982 | 2171 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2172 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2173 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2174 continue; /* nothing to replace */ | |
2175 | |
2176 /* n == number of extra chars required | |
2177 * If we split a TAB, it may be replaced by several characters. | |
2178 * Thus the number of characters may increase! | |
2179 */ | |
2180 /* If the range starts in virtual space, count the initial | |
2181 * coladd offset as part of "startspaces" */ | |
2182 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2183 { | |
2184 pos_T vpos; | |
2185 | |
1982 | 2186 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2187 getvpos(&vpos, oap->start_vcol); |
2188 bd.startspaces += vpos.coladd; | |
2189 n = bd.startspaces; | |
2190 } | |
2191 else | |
2192 /* allow for pre spaces */ | |
2193 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2194 | |
2195 /* allow for post spp */ | |
2196 n += (bd.endspaces | |
2197 && !bd.is_oneChar | |
2198 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2199 /* Figure out how many characters to replace. */ | |
2200 numc = oap->end_vcol - oap->start_vcol + 1; | |
2201 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2202 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2203 | |
2204 /* A double-wide character can be replaced only up to half the | |
2205 * times. */ | |
2206 if ((*mb_char2cells)(c) > 1) | |
2207 { | |
2208 if ((numc & 1) && !bd.is_short) | |
2209 { | |
2210 ++bd.endspaces; | |
2211 ++n; | |
2212 } | |
2213 numc = numc / 2; | |
2214 } | |
2215 | |
2216 /* Compute bytes needed, move character count to num_chars. */ | |
2217 num_chars = numc; | |
2218 numc *= (*mb_char2len)(c); | |
2219 /* oldlen includes textlen, so don't double count */ | |
2220 n += numc - bd.textlen; | |
2221 | |
2222 oldp = ml_get_curline(); | |
2223 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
|
2224 newp = alloc(oldlen + 1 + n); |
7 | 2225 if (newp == NULL) |
2226 continue; | |
2227 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2228 /* copy up to deleted part */ | |
2229 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2230 oldp += bd.textcol + bd.textlen; | |
2231 /* insert pre-spaces */ | |
6929 | 2232 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2233 /* 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
|
2234 /* 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
|
2235 * literally. */ |
5428 | 2236 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
7 | 2237 { |
5428 | 2238 if (has_mbyte) |
2239 { | |
2240 n = (int)STRLEN(newp); | |
2241 while (--num_chars >= 0) | |
2242 n += (*mb_char2bytes)(c, newp + n); | |
2243 } | |
2244 else | |
6929 | 2245 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2246 if (!bd.is_short) |
2247 { | |
2248 /* insert post-spaces */ | |
6929 | 2249 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2250 /* copy the part after the changed part */ |
2251 STRMOVE(newp + STRLEN(newp), oldp); | |
2252 } | |
7 | 2253 } |
2254 else | |
2255 { | |
5428 | 2256 /* 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
|
2257 after_p = alloc(oldlen + 1 + n - STRLEN(newp)); |
5428 | 2258 if (after_p != NULL) |
2259 STRMOVE(after_p, oldp); | |
7 | 2260 } |
2261 /* replace the line */ | |
2262 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2263 if (after_p != NULL) |
2264 { | |
2265 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2266 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2267 oap->end.lnum++; | |
2268 vim_free(after_p); | |
2269 } | |
7 | 2270 } |
2271 } | |
2272 else | |
2273 { | |
2274 /* | |
2275 * MCHAR and MLINE motion replace. | |
2276 */ | |
2277 if (oap->motion_type == MLINE) | |
2278 { | |
2279 oap->start.col = 0; | |
2280 curwin->w_cursor.col = 0; | |
2281 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2282 if (oap->end.col) | |
2283 --oap->end.col; | |
2284 } | |
2285 else if (!oap->inclusive) | |
2286 dec(&(oap->end)); | |
2287 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2288 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2289 { |
2290 n = gchar_cursor(); | |
2291 if (n != NUL) | |
2292 { | |
2293 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2294 { | |
2295 /* This is slow, but it handles replacing a single-byte | |
2296 * with a multi-byte and the other way around. */ | |
4203 | 2297 if (curwin->w_cursor.lnum == oap->end.lnum) |
2298 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
|
2299 replace_character(c); |
7 | 2300 } |
2301 else | |
2302 { | |
2303 if (n == TAB) | |
2304 { | |
2305 int end_vcol = 0; | |
2306 | |
2307 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2308 { | |
2309 /* oap->end has to be recalculated when | |
2310 * the tab breaks */ | |
2311 end_vcol = getviscol2(oap->end.col, | |
2312 oap->end.coladd); | |
2313 } | |
2314 coladvance_force(getviscol()); | |
2315 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2316 getvpos(&oap->end, end_vcol); | |
2317 } | |
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
|
2318 PBYTE(curwin->w_cursor, c); |
7 | 2319 } |
2320 } | |
2321 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2322 { | |
2323 int virtcols = oap->end.coladd; | |
2324 | |
2325 if (curwin->w_cursor.lnum == oap->start.lnum | |
2326 && oap->start.col == oap->end.col && oap->start.coladd) | |
2327 virtcols -= oap->start.coladd; | |
2328 | |
2329 /* oap->end has been trimmed so it's effectively inclusive; | |
2330 * as a result an extra +1 must be counted so we don't | |
2331 * trample the NUL byte. */ | |
2332 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2333 curwin->w_cursor.col -= (virtcols + 1); | |
2334 for (; virtcols >= 0; virtcols--) | |
2335 { | |
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
|
2336 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
|
2337 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
|
2338 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
|
2339 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
|
2340 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
|
2341 break; |
7 | 2342 } |
2343 } | |
2344 | |
2345 /* Advance to next character, stop at the end of the file. */ | |
2346 if (inc_cursor() == -1) | |
2347 break; | |
2348 } | |
2349 } | |
2350 | |
2351 curwin->w_cursor = oap->start; | |
2352 check_cursor(); | |
2353 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2354 | |
2355 /* Set "'[" and "']" marks. */ | |
2356 curbuf->b_op_start = oap->start; | |
2357 curbuf->b_op_end = oap->end; | |
2358 | |
2359 return OK; | |
2360 } | |
2361 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2362 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2363 |
7 | 2364 /* |
2365 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2366 */ | |
2367 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2368 op_tilde(oparg_T *oap) |
7 | 2369 { |
2370 pos_T pos; | |
2371 struct block_def bd; | |
1528 | 2372 int did_change = FALSE; |
7 | 2373 |
2374 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2375 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2376 return; | |
2377 | |
2378 pos = oap->start; | |
2379 if (oap->block_mode) /* Visual block mode */ | |
2380 { | |
2381 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2382 { | |
1766 | 2383 int one_change; |
2384 | |
7 | 2385 block_prep(oap, &bd, pos.lnum, FALSE); |
2386 pos.col = bd.textcol; | |
1766 | 2387 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2388 did_change |= one_change; | |
1525 | 2389 |
5735 | 2390 #ifdef FEAT_NETBEANS_INTG |
2210 | 2391 if (netbeans_active() && one_change) |
7 | 2392 { |
2393 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2394 | |
33 | 2395 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2396 (long)bd.textlen); | |
7 | 2397 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2398 &ptr[bd.textcol], bd.textlen); |
7 | 2399 } |
5735 | 2400 #endif |
7 | 2401 } |
2402 if (did_change) | |
2403 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2404 } | |
2405 else /* not block mode */ | |
2406 { | |
2407 if (oap->motion_type == MLINE) | |
2408 { | |
2409 oap->start.col = 0; | |
2410 pos.col = 0; | |
2411 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2412 if (oap->end.col) | |
2413 --oap->end.col; | |
2414 } | |
2415 else if (!oap->inclusive) | |
2416 dec(&(oap->end)); | |
2417 | |
1528 | 2418 if (pos.lnum == oap->end.lnum) |
2419 did_change = swapchars(oap->op_type, &pos, | |
2420 oap->end.col - pos.col + 1); | |
2421 else | |
2422 for (;;) | |
2423 { | |
2424 did_change |= swapchars(oap->op_type, &pos, | |
2425 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2426 (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
|
2427 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2428 break; |
2429 } | |
7 | 2430 if (did_change) |
2431 { | |
2432 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2433 0L); | |
2434 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2435 if (netbeans_active() && did_change) |
7 | 2436 { |
2437 char_u *ptr; | |
2438 int count; | |
2439 | |
2440 pos = oap->start; | |
2441 while (pos.lnum < oap->end.lnum) | |
2442 { | |
2443 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2444 count = (int)STRLEN(ptr) - pos.col; |
33 | 2445 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2446 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2447 &ptr[pos.col], count); |
7 | 2448 pos.col = 0; |
2449 pos.lnum++; | |
2450 } | |
2451 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2452 count = oap->end.col - pos.col + 1; | |
33 | 2453 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2454 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2455 &ptr[pos.col], count); |
7 | 2456 } |
2457 #endif | |
2458 } | |
2459 } | |
2460 | |
2461 if (!did_change && oap->is_VIsual) | |
2462 /* No change: need to remove the Visual selection */ | |
2463 redraw_curbuf_later(INVERTED); | |
2464 | |
2465 /* | |
2466 * Set '[ and '] marks. | |
2467 */ | |
2468 curbuf->b_op_start = oap->start; | |
2469 curbuf->b_op_end = oap->end; | |
2470 | |
2471 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
|
2472 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
|
2473 oap->line_count), oap->line_count); |
7 | 2474 } |
2475 | |
2476 /* | |
1525 | 2477 * Invoke swapchar() on "length" bytes at position "pos". |
2478 * "pos" is advanced to just after the changed characters. | |
2479 * "length" is rounded up to include the whole last multi-byte character. | |
2480 * Also works correctly when the number of bytes changes. | |
2481 * Returns TRUE if some character was changed. | |
2482 */ | |
2483 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2484 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2485 { |
2486 int todo; | |
2487 int did_change = 0; | |
2488 | |
2489 for (todo = length; todo > 0; --todo) | |
2490 { | |
2491 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2492 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2493 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2494 |
1525 | 2495 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2496 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2497 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2498 } |
1525 | 2499 did_change |= swapchar(op_type, pos); |
2500 if (inc(pos) == -1) /* at end of file */ | |
2501 break; | |
2502 } | |
2503 return did_change; | |
2504 } | |
2505 | |
2506 /* | |
7 | 2507 * If op_type == OP_UPPER: make uppercase, |
2508 * if op_type == OP_LOWER: make lowercase, | |
2509 * if op_type == OP_ROT13: do rot13 encoding, | |
2510 * else swap case of character at 'pos' | |
2511 * returns TRUE when something actually changed. | |
2512 */ | |
2513 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2514 swapchar(int op_type, pos_T *pos) |
7 | 2515 { |
2516 int c; | |
2517 int nc; | |
2518 | |
2519 c = gchar_pos(pos); | |
2520 | |
2521 /* Only do rot13 encoding for ASCII characters. */ | |
2522 if (c >= 0x80 && op_type == OP_ROT13) | |
2523 return FALSE; | |
2524 | |
1525 | 2525 if (op_type == OP_UPPER && c == 0xdf |
2526 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2527 { |
2528 pos_T sp = curwin->w_cursor; | |
2529 | |
2530 /* Special handling of German sharp s: change to "SS". */ | |
2531 curwin->w_cursor = *pos; | |
2532 del_char(FALSE); | |
2533 ins_char('S'); | |
2534 ins_char('S'); | |
2535 curwin->w_cursor = sp; | |
2536 inc(pos); | |
2537 } | |
2538 | |
7 | 2539 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2540 return FALSE; | |
2541 nc = c; | |
2542 if (MB_ISLOWER(c)) | |
2543 { | |
2544 if (op_type == OP_ROT13) | |
2545 nc = ROT13(c, 'a'); | |
2546 else if (op_type != OP_LOWER) | |
2547 nc = MB_TOUPPER(c); | |
2548 } | |
2549 else if (MB_ISUPPER(c)) | |
2550 { | |
2551 if (op_type == OP_ROT13) | |
2552 nc = ROT13(c, 'A'); | |
2553 else if (op_type != OP_UPPER) | |
2554 nc = MB_TOLOWER(c); | |
2555 } | |
2556 if (nc != c) | |
2557 { | |
2558 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2559 { | |
2560 pos_T sp = curwin->w_cursor; | |
2561 | |
2562 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2563 /* 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
|
2564 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2565 ins_char(nc); |
2566 curwin->w_cursor = sp; | |
2567 } | |
2568 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
|
2569 PBYTE(*pos, nc); |
7 | 2570 return TRUE; |
2571 } | |
2572 return FALSE; | |
2573 } | |
2574 | |
2575 /* | |
2576 * op_insert - Insert and append operators for Visual mode. | |
2577 */ | |
2578 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2579 op_insert(oparg_T *oap, long count1) |
7 | 2580 { |
2581 long ins_len, pre_textlen = 0; | |
2582 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2583 colnr_T ind_pre = 0, ind_post; |
7 | 2584 struct block_def bd; |
2585 int i; | |
6579 | 2586 pos_T t1; |
7 | 2587 |
2588 /* edit() changes this - record it for OP_APPEND */ | |
2589 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2590 | |
2591 /* vis block is still marked. Get rid of it now. */ | |
2592 curwin->w_cursor.lnum = oap->start.lnum; | |
2593 update_screen(INVERTED); | |
2594 | |
2595 if (oap->block_mode) | |
2596 { | |
2597 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2598 * doing block_prep(). When only "block" is used, virtual edit is | |
2599 * already disabled, but still need it when calling | |
2600 * coladvance_force(). */ | |
2601 if (curwin->w_cursor.coladd > 0) | |
2602 { | |
2603 int old_ve_flags = ve_flags; | |
2604 | |
2605 ve_flags = VE_ALL; | |
2606 if (u_save_cursor() == FAIL) | |
2607 return; | |
2608 coladvance_force(oap->op_type == OP_APPEND | |
2609 ? oap->end_vcol + 1 : getviscol()); | |
2610 if (oap->op_type == OP_APPEND) | |
2611 --curwin->w_cursor.col; | |
2612 ve_flags = old_ve_flags; | |
2613 } | |
2614 /* Get the info about the block before entering the text */ | |
2615 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
|
2616 /* 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
|
2617 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2618 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
|
2619 |
7 | 2620 if (oap->op_type == OP_APPEND) |
2621 firstline += bd.textlen; | |
2622 pre_textlen = (long)STRLEN(firstline); | |
2623 } | |
2624 | |
2625 if (oap->op_type == OP_APPEND) | |
2626 { | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2627 if (oap->block_mode && curwin->w_cursor.coladd == 0) |
7 | 2628 { |
2629 /* Move the cursor to the character right of the block. */ | |
2630 curwin->w_set_curswant = TRUE; | |
2631 while (*ml_get_cursor() != NUL | |
2632 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2633 ++curwin->w_cursor.col; | |
2634 if (bd.is_short && !bd.is_MAX) | |
2635 { | |
2636 /* First line was too short, make it longer and adjust the | |
2637 * values in "bd". */ | |
2638 if (u_save_cursor() == FAIL) | |
2639 return; | |
2640 for (i = 0; i < bd.endspaces; ++i) | |
2641 ins_char(' '); | |
2642 bd.textlen += bd.endspaces; | |
2643 } | |
2644 } | |
2645 else | |
2646 { | |
2647 curwin->w_cursor = oap->end; | |
893 | 2648 check_cursor_col(); |
7 | 2649 |
2650 /* 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
|
2651 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2652 && oap->start_vcol != oap->end_vcol) |
2653 inc_cursor(); | |
2654 } | |
2655 } | |
2656 | |
6579 | 2657 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
|
2658 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2659 |
6579 | 2660 /* When a tab was inserted, and the characters in front of the tab |
2661 * have been converted to a tab as well, the column of the cursor | |
2662 * might have actually been reduced, so need to adjust here. */ | |
2663 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
|
2664 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2665 oap->start = curbuf->b_op_start_orig; |
2666 | |
1477 | 2667 /* If user has moved off this line, we don't know what to do, so do |
2668 * nothing. | |
2669 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2670 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2671 return; |
2672 | |
2673 if (oap->block_mode) | |
2674 { | |
2675 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
|
2676 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
|
2677 size_t len; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2678 int add; |
7 | 2679 |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2680 /* 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
|
2681 * 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
|
2682 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2683 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
|
2684 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2685 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2686 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
|
2687 did_indent = TRUE; |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2688 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2689 |
5471 | 2690 /* 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
|
2691 * 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
|
2692 * 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
|
2693 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
|
2694 && !bd.is_MAX && !did_indent) |
5471 | 2695 { |
2696 if (oap->op_type == OP_INSERT | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2697 && oap->start.col + oap->start.coladd |
5730 | 2698 != curbuf->b_op_start_orig.col |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2699 + curbuf->b_op_start_orig.coladd) |
5471 | 2700 { |
6579 | 2701 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
|
2702 curbuf->b_op_start_orig.coladd); |
5680 | 2703 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2704 pre_textlen -= t - oap->start_vcol; |
2705 oap->start_vcol = t; | |
5471 | 2706 } |
2707 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
|
2708 && oap->end.col + oap->end.coladd |
5730 | 2709 >= curbuf->b_op_start_orig.col |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2710 + curbuf->b_op_start_orig.coladd) |
5471 | 2711 { |
6579 | 2712 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
|
2713 curbuf->b_op_start_orig.coladd); |
5680 | 2714 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2715 /* reset pre_textlen to the value of OP_INSERT */ |
2716 pre_textlen += bd.textlen; | |
6579 | 2717 pre_textlen -= t - oap->start_vcol; |
2718 oap->start_vcol = t; | |
5471 | 2719 oap->op_type = OP_INSERT; |
2720 } | |
2721 } | |
2722 | |
7 | 2723 /* |
2724 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2725 * tabs. Get the starting column again and correct the length. |
7 | 2726 * Don't do this when "$" used, end-of-line will have changed. |
2727 */ | |
2728 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2729 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2730 { | |
2731 if (oap->op_type == OP_APPEND) | |
2732 { | |
2733 pre_textlen += bd2.textlen - bd.textlen; | |
2734 if (bd2.endspaces) | |
2735 --bd2.textlen; | |
2736 } | |
2737 bd.textcol = bd2.textcol; | |
2738 bd.textlen = bd2.textlen; | |
2739 } | |
2740 | |
2741 /* | |
2742 * Subsequent calls to ml_get() flush the firstline data - take a | |
2743 * copy of the required string. | |
2744 */ | |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2745 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
|
2746 len = STRLEN(firstline); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2747 add = bd.textcol; |
7 | 2748 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
|
2749 add += bd.textlen; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2750 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
|
2751 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
|
2752 else |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2753 firstline += add; |
3421 | 2754 if (pre_textlen >= 0 |
2755 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2756 { |
2757 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2758 if (ins_text != NULL) | |
2759 { | |
2760 /* block handled here */ | |
2761 if (u_save(oap->start.lnum, | |
2762 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2763 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2764 &bd); | |
2765 | |
2766 curwin->w_cursor.col = oap->start.col; | |
2767 check_cursor(); | |
2768 vim_free(ins_text); | |
2769 } | |
2770 } | |
2771 } | |
2772 } | |
2773 | |
2774 /* | |
2775 * op_change - handle a change operation | |
2776 * | |
2777 * return TRUE if edit() returns because of a CTRL-O command | |
2778 */ | |
2779 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2780 op_change(oparg_T *oap) |
7 | 2781 { |
2782 colnr_T l; | |
2783 int retval; | |
2784 long offset; | |
2785 linenr_T linenr; | |
1392 | 2786 long ins_len; |
2787 long pre_textlen = 0; | |
2788 long pre_indent = 0; | |
7 | 2789 char_u *firstline; |
2790 char_u *ins_text, *newp, *oldp; | |
2791 struct block_def bd; | |
2792 | |
2793 l = oap->start.col; | |
2794 if (oap->motion_type == MLINE) | |
2795 { | |
2796 l = 0; | |
2797 #ifdef FEAT_SMARTINDENT | |
2798 if (!p_paste && curbuf->b_p_si | |
2799 # ifdef FEAT_CINDENT | |
2800 && !curbuf->b_p_cin | |
2801 # endif | |
2802 ) | |
2803 can_si = TRUE; /* It's like opening a new line, do si */ | |
2804 #endif | |
2805 } | |
2806 | |
2807 /* First delete the text in the region. In an empty buffer only need to | |
2808 * save for undo */ | |
2809 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2810 { | |
2811 if (u_save_cursor() == FAIL) | |
2812 return FALSE; | |
2813 } | |
2814 else if (op_delete(oap) == FAIL) | |
2815 return FALSE; | |
2816 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2817 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2818 && !virtual_op) |
2819 inc_cursor(); | |
2820 | |
2821 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2822 /* skip blank lines too */ | |
2823 if (oap->block_mode) | |
2824 { | |
2825 /* Add spaces before getting the current line length. */ | |
2826 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2827 || gchar_cursor() == NUL)) | |
2828 coladvance_force(getviscol()); | |
1392 | 2829 firstline = ml_get(oap->start.lnum); |
2830 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
|
2831 pre_indent = (long)getwhitecols(firstline); |
7 | 2832 bd.textcol = curwin->w_cursor.col; |
2833 } | |
2834 | |
2835 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2836 if (oap->motion_type == MLINE) | |
2837 fix_indent(); | |
2838 #endif | |
2839 | |
2840 retval = edit(NUL, FALSE, (linenr_T)1); | |
2841 | |
2842 /* | |
39 | 2843 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2844 * block. |
1477 | 2845 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2846 */ |
1477 | 2847 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2848 { |
1392 | 2849 /* Auto-indenting may have changed the indent. If the cursor was past |
2850 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2851 firstline = ml_get(oap->start.lnum); |
1403 | 2852 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2853 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2854 long new_indent = (long)getwhitecols(firstline); |
1392 | 2855 |
2856 pre_textlen += new_indent - pre_indent; | |
2857 bd.textcol += new_indent - pre_indent; | |
2858 } | |
2859 | |
2860 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2861 if (ins_len > 0) | |
2862 { | |
2863 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2864 * 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
|
2865 if ((ins_text = alloc(ins_len + 1)) != NULL) |
7 | 2866 { |
419 | 2867 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2868 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2869 linenr++) | |
2870 { | |
2871 block_prep(oap, &bd, linenr, TRUE); | |
2872 if (!bd.is_short || virtual_op) | |
2873 { | |
2874 pos_T vpos; | |
2875 | |
2876 /* If the block starts in virtual space, count the | |
2877 * initial coladd offset as part of "startspaces" */ | |
2878 if (bd.is_short) | |
2879 { | |
1982 | 2880 vpos.lnum = linenr; |
7 | 2881 (void)getvpos(&vpos, oap->start_vcol); |
2882 } | |
2883 else | |
2884 vpos.coladd = 0; | |
2885 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
|
2886 newp = alloc(STRLEN(oldp) + vpos.coladd + ins_len + 1); |
7 | 2887 if (newp == NULL) |
2888 continue; | |
2889 /* copy up to block start */ | |
2890 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2891 offset = bd.textcol; | |
6929 | 2892 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2893 offset += vpos.coladd; |
2894 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2895 offset += ins_len; | |
2896 oldp += bd.textcol; | |
1622 | 2897 STRMOVE(newp + offset, oldp); |
7 | 2898 ml_replace(linenr, newp, FALSE); |
2899 } | |
2900 } | |
2901 check_cursor(); | |
2902 | |
2903 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2904 } | |
2905 vim_free(ins_text); | |
2906 } | |
2907 } | |
2908 | |
2909 return retval; | |
2910 } | |
2911 | |
2912 /* | |
2913 * set all the yank registers to empty (called from main()) | |
2914 */ | |
2915 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2916 init_yank(void) |
7 | 2917 { |
2918 int i; | |
2919 | |
2920 for (i = 0; i < NUM_REGISTERS; ++i) | |
2921 y_regs[i].y_array = NULL; | |
2922 } | |
2923 | |
356 | 2924 #if defined(EXITFREE) || defined(PROTO) |
2925 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2926 clear_registers(void) |
356 | 2927 { |
2928 int i; | |
2929 | |
2930 for (i = 0; i < NUM_REGISTERS; ++i) | |
2931 { | |
2932 y_current = &y_regs[i]; | |
2933 if (y_current->y_array != NULL) | |
2934 free_yank_all(); | |
2935 } | |
2936 } | |
2937 #endif | |
2938 | |
7 | 2939 /* |
2940 * Free "n" lines from the current yank register. | |
2941 * Called for normal freeing and in case of error. | |
2942 */ | |
2943 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2944 free_yank(long n) |
7 | 2945 { |
2946 if (y_current->y_array != NULL) | |
2947 { | |
2948 long i; | |
2949 | |
2950 for (i = n; --i >= 0; ) | |
2951 { | |
2952 #ifdef AMIGA /* only for very slow machines */ | |
2953 if ((i & 1023) == 1023) /* this may take a while */ | |
2954 { | |
2955 /* | |
2956 * This message should never cause a hit-return message. | |
2957 * Overwrite this message with any next message. | |
2958 */ | |
2959 ++no_wait_return; | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2960 smsg(_("freeing %ld lines"), i + 1); |
7 | 2961 --no_wait_return; |
2962 msg_didout = FALSE; | |
2963 msg_col = 0; | |
2964 } | |
2965 #endif | |
2966 vim_free(y_current->y_array[i]); | |
2967 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
2968 VIM_CLEAR(y_current->y_array); |
7 | 2969 #ifdef AMIGA |
2970 if (n >= 1000) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
2971 msg(""); |
7 | 2972 #endif |
2973 } | |
2974 } | |
2975 | |
2976 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2977 free_yank_all(void) |
7 | 2978 { |
2979 free_yank(y_current->y_size); | |
2980 } | |
2981 | |
2982 /* | |
2983 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2984 * If we are to append (uppercase register), we first yank into a new yank | |
2985 * register and then concatenate the old and the new one (so we keep the old | |
2986 * one in case of out-of-memory). | |
2987 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2988 * Return FAIL for failure, OK otherwise. |
7 | 2989 */ |
2990 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2991 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 2992 { |
2993 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
|
2994 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
|
2995 yankreg_T newreg; /* new yank register when appending */ |
7 | 2996 char_u **new_ptr; |
2997 linenr_T lnum; /* current line number */ | |
2998 long j; | |
2999 int yanktype = oap->motion_type; | |
3000 long yanklines = oap->line_count; | |
3001 linenr_T yankendlnum = oap->end.lnum; | |
3002 char_u *p; | |
3003 char_u *pnew; | |
3004 struct block_def bd; | |
2658 | 3005 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3006 int did_star = FALSE; |
2658 | 3007 #endif |
7 | 3008 |
3009 /* check for read-only register */ | |
3010 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3011 { | |
3012 beep_flush(); | |
3013 return FAIL; | |
3014 } | |
3015 if (oap->regname == '_') /* black hole: nothing to do */ | |
3016 return OK; | |
3017 | |
3018 #ifdef FEAT_CLIPBOARD | |
3019 if (!clip_star.available && oap->regname == '*') | |
3020 oap->regname = 0; | |
3021 else if (!clip_plus.available && oap->regname == '+') | |
3022 oap->regname = 0; | |
3023 #endif | |
3024 | |
3025 if (!deleting) /* op_delete() already set y_current */ | |
3026 get_yank_register(oap->regname, TRUE); | |
3027 | |
3028 curr = y_current; | |
3029 /* append to existing contents */ | |
3030 if (y_append && y_current->y_array != NULL) | |
3031 y_current = &newreg; | |
3032 else | |
3033 free_yank_all(); /* free previously yanked lines */ | |
3034 | |
593 | 3035 /* |
3036 * If the cursor was in column 1 before and after the movement, and the | |
3037 * operator is not inclusive, the yank is always linewise. | |
3038 */ | |
7 | 3039 if ( oap->motion_type == MCHAR |
3040 && oap->start.col == 0 | |
3041 && !oap->inclusive | |
3042 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3043 && !oap->block_mode |
7 | 3044 && oap->end.col == 0 |
3045 && yanklines > 1) | |
3046 { | |
3047 yanktype = MLINE; | |
3048 --yankendlnum; | |
3049 --yanklines; | |
3050 } | |
3051 | |
3052 y_current->y_size = yanklines; | |
3053 y_current->y_type = yanktype; /* set the yank register type */ | |
3054 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
|
3055 y_current->y_array = lalloc_clear(sizeof(char_u *) * yanklines, TRUE); |
7 | 3056 if (y_current->y_array == NULL) |
3057 { | |
3058 y_current = curr; | |
3059 return FAIL; | |
3060 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3061 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3062 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
|
3063 #endif |
7 | 3064 |
3065 y_idx = 0; | |
3066 lnum = oap->start.lnum; | |
3067 | |
3068 if (oap->block_mode) | |
3069 { | |
3070 /* Visual block mode */ | |
3071 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3072 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3073 | |
3074 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3075 y_current->y_width--; | |
3076 } | |
3077 | |
3078 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3079 { | |
3080 switch (y_current->y_type) | |
3081 { | |
3082 case MBLOCK: | |
3083 block_prep(oap, &bd, lnum, FALSE); | |
3084 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3085 goto fail; | |
3086 break; | |
3087 | |
3088 case MLINE: | |
3089 if ((y_current->y_array[y_idx] = | |
3090 vim_strsave(ml_get(lnum))) == NULL) | |
3091 goto fail; | |
3092 break; | |
3093 | |
3094 case MCHAR: | |
3095 { | |
3096 colnr_T startcol = 0, endcol = MAXCOL; | |
3097 int is_oneChar = FALSE; | |
3098 colnr_T cs, ce; | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3099 |
7 | 3100 p = ml_get(lnum); |
3101 bd.startspaces = 0; | |
3102 bd.endspaces = 0; | |
3103 | |
3104 if (lnum == oap->start.lnum) | |
3105 { | |
3106 startcol = oap->start.col; | |
3107 if (virtual_op) | |
3108 { | |
3109 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3110 if (ce != cs && oap->start.coladd > 0) | |
3111 { | |
3112 /* Part of a tab selected -- but don't | |
3113 * double-count it. */ | |
3114 bd.startspaces = (ce - cs + 1) | |
3115 - oap->start.coladd; | |
3116 startcol++; | |
3117 } | |
3118 } | |
3119 } | |
3120 | |
3121 if (lnum == oap->end.lnum) | |
3122 { | |
3123 endcol = oap->end.col; | |
3124 if (virtual_op) | |
3125 { | |
3126 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3127 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3128 /* Don't add space for double-wide | |
3129 * char; endcol will be on last byte | |
3130 * of multi-byte char. */ | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3131 && (*mb_head_off)(p, p + endcol) == 0)) |
7 | 3132 { |
3133 if (oap->start.lnum == oap->end.lnum | |
3134 && oap->start.col == oap->end.col) | |
3135 { | |
3136 /* Special case: inside a single char */ | |
3137 is_oneChar = TRUE; | |
3138 bd.startspaces = oap->end.coladd | |
3139 - oap->start.coladd + oap->inclusive; | |
3140 endcol = startcol; | |
3141 } | |
3142 else | |
3143 { | |
3144 bd.endspaces = oap->end.coladd | |
3145 + oap->inclusive; | |
3146 endcol -= oap->inclusive; | |
3147 } | |
3148 } | |
3149 } | |
3150 } | |
3510 | 3151 if (endcol == MAXCOL) |
3152 endcol = (colnr_T)STRLEN(p); | |
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3153 if (startcol > endcol || is_oneChar) |
7 | 3154 bd.textlen = 0; |
3155 else | |
3156 bd.textlen = endcol - startcol + oap->inclusive; | |
3157 bd.textstart = p + startcol; | |
3158 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3159 goto fail; | |
3160 break; | |
3161 } | |
3162 /* NOTREACHED */ | |
3163 } | |
3164 } | |
3165 | |
3166 if (curr != y_current) /* append the new block to the old block */ | |
3167 { | |
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
|
3168 new_ptr = ALLOC_MULT(char_u *, curr->y_size + y_current->y_size); |
7 | 3169 if (new_ptr == NULL) |
3170 goto fail; | |
3171 for (j = 0; j < curr->y_size; ++j) | |
3172 new_ptr[j] = curr->y_array[j]; | |
3173 vim_free(curr->y_array); | |
3174 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3175 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3176 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3177 #endif |
7 | 3178 |
3179 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3180 curr->y_type = MLINE; | |
3181 | |
164 | 3182 /* Concatenate the last line of the old block with the first line of |
3183 * the new block, unless being Vi compatible. */ | |
3184 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3185 { |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
3186 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
|
3187 + STRLEN(y_current->y_array[0]) + 1); |
7 | 3188 if (pnew == NULL) |
3189 { | |
3190 y_idx = y_current->y_size - 1; | |
3191 goto fail; | |
3192 } | |
3193 STRCPY(pnew, curr->y_array[--j]); | |
3194 STRCAT(pnew, y_current->y_array[0]); | |
3195 vim_free(curr->y_array[j]); | |
3196 vim_free(y_current->y_array[0]); | |
3197 curr->y_array[j++] = pnew; | |
3198 y_idx = 1; | |
3199 } | |
3200 else | |
3201 y_idx = 0; | |
3202 while (y_idx < y_current->y_size) | |
3203 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3204 curr->y_size = j; | |
3205 vim_free(y_current->y_array); | |
3206 y_current = curr; | |
3207 } | |
5981 | 3208 if (curwin->w_p_rnu) |
3209 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3210 if (mess) /* Display message about yank? */ |
3211 { | |
3212 if (yanktype == MCHAR | |
3213 && !oap->block_mode | |
3214 && yanklines == 1) | |
3215 yanklines = 0; | |
3216 /* Some versions of Vi use ">=" here, some don't... */ | |
3217 if (yanklines > p_report) | |
3218 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3219 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
|
3220 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3221 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
|
3222 *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
|
3223 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3224 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
|
3225 _(" 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
|
3226 |
7 | 3227 /* redisplay now, so message is not deleted */ |
3228 update_topline_redraw(); | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3229 if (oap->block_mode) |
205 | 3230 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3231 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
|
3232 "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
|
3233 yanklines, namebuf); |
205 | 3234 } |
7 | 3235 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3236 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3237 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
|
3238 "%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
|
3239 yanklines, namebuf); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3240 } |
7 | 3241 } |
3242 } | |
3243 | |
3244 /* | |
3245 * Set "'[" and "']" marks. | |
3246 */ | |
3247 curbuf->b_op_start = oap->start; | |
3248 curbuf->b_op_end = oap->end; | |
5735 | 3249 if (yanktype == MLINE && !oap->block_mode) |
36 | 3250 { |
3251 curbuf->b_op_start.col = 0; | |
3252 curbuf->b_op_end.col = MAXCOL; | |
3253 } | |
7 | 3254 |
3255 #ifdef FEAT_CLIPBOARD | |
3256 /* | |
3257 * If we were yanking to the '*' register, send result to clipboard. | |
3258 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3259 * to the '*' register. | |
3260 */ | |
3261 if (clip_star.available | |
3262 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3263 || (!deleting && oap->regname == 0 |
6116 | 3264 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3265 { |
3266 if (curr != &(y_regs[STAR_REGISTER])) | |
3267 /* Copy the text from register 0 to the clipboard register. */ | |
3268 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3269 | |
3270 clip_own_selection(&clip_star); | |
3271 clip_gen_set_selection(&clip_star); | |
2658 | 3272 # ifdef FEAT_X11 |
2654 | 3273 did_star = TRUE; |
2658 | 3274 # endif |
7 | 3275 } |
3276 | |
3277 # ifdef FEAT_X11 | |
3278 /* | |
3279 * If we were yanking to the '+' register, send result to selection. | |
3280 * Also copy to the '*' register, in case auto-select is off. | |
3281 */ | |
2654 | 3282 if (clip_plus.available |
3283 && (curr == &(y_regs[PLUS_REGISTER]) | |
3284 || (!deleting && oap->regname == 0 | |
6116 | 3285 && ((clip_unnamed | clip_unnamed_saved) & |
3286 CLIP_UNNAMED_PLUS)))) | |
7 | 3287 { |
2654 | 3288 if (curr != &(y_regs[PLUS_REGISTER])) |
3289 /* Copy the text from register 0 to the clipboard register. */ | |
3290 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3291 | |
7 | 3292 clip_own_selection(&clip_plus); |
3293 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
|
3294 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
|
3295 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3296 { |
3297 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3298 clip_own_selection(&clip_star); | |
3299 clip_gen_set_selection(&clip_star); | |
3300 } | |
3301 } | |
3302 # endif | |
3303 #endif | |
3304 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3305 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3306 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3307 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
|
3308 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3309 |
7 | 3310 return OK; |
3311 | |
3312 fail: /* free the allocated lines */ | |
3313 free_yank(y_idx + 1); | |
3314 y_current = curr; | |
3315 return FAIL; | |
3316 } | |
3317 | |
3318 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3319 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3320 { |
3321 char_u *pnew; | |
3322 | |
3323 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3324 == NULL) | |
3325 return FAIL; | |
3326 y_current->y_array[y_idx] = pnew; | |
6929 | 3327 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3328 pnew += bd->startspaces; |
3329 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3330 pnew += bd->textlen; | |
6929 | 3331 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3332 pnew += bd->endspaces; |
3333 *pnew = NUL; | |
3334 return OK; | |
3335 } | |
3336 | |
3337 #ifdef FEAT_CLIPBOARD | |
3338 /* | |
3339 * Make a copy of the y_current register to register "reg". | |
3340 */ | |
3341 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3342 copy_yank_reg(yankreg_T *reg) |
7 | 3343 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3344 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3345 long j; |
7 | 3346 |
3347 y_current = reg; | |
3348 free_yank_all(); | |
3349 *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
|
3350 y_current->y_array = lalloc_clear( |
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3351 sizeof(char_u *) * y_current->y_size, TRUE); |
7 | 3352 if (y_current->y_array == NULL) |
3353 y_current->y_size = 0; | |
3354 else | |
3355 for (j = 0; j < y_current->y_size; ++j) | |
3356 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3357 { | |
3358 free_yank(j); | |
3359 y_current->y_size = 0; | |
3360 break; | |
3361 } | |
3362 y_current = curr; | |
3363 } | |
3364 #endif | |
3365 | |
3366 /* | |
140 | 3367 * Put contents of register "regname" into the text. |
3368 * Caller must check "regname" to be valid! | |
3369 * "flags": PUT_FIXINDENT make indent look nice | |
3370 * PUT_CURSEND leave cursor after end of new text | |
3371 * PUT_LINE force linewise put (":put") | |
7 | 3372 */ |
3373 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3374 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3375 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3376 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
|
3377 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3378 int flags) |
7 | 3379 { |
3380 char_u *ptr; | |
3381 char_u *newp, *oldp; | |
3382 int yanklen; | |
3383 int totlen = 0; /* init for gcc */ | |
3384 linenr_T lnum; | |
3385 colnr_T col; | |
3386 long i; /* index in y_array[] */ | |
3387 int y_type; | |
3388 long y_size; | |
3389 int oldlen; | |
3390 long y_width = 0; | |
3391 colnr_T vcol; | |
3392 int delcount; | |
3393 int incr = 0; | |
3394 long j; | |
3395 struct block_def bd; | |
3396 char_u **y_array = NULL; | |
3397 long nr_lines = 0; | |
3398 pos_T new_cursor; | |
3399 int indent; | |
3400 int orig_indent = 0; /* init for gcc */ | |
3401 int indent_diff = 0; /* init for gcc */ | |
3402 int first_indent = TRUE; | |
3403 int lendiff = 0; | |
3404 pos_T old_pos; | |
3405 char_u *insert_string = NULL; | |
3406 int allocated = FALSE; | |
3407 long cnt; | |
3408 | |
3409 #ifdef FEAT_CLIPBOARD | |
3410 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3411 adjust_clip_reg(®name); | |
3412 (void)may_get_selection(regname); | |
3413 #endif | |
3414 | |
3415 if (flags & PUT_FIXINDENT) | |
3416 orig_indent = get_indent(); | |
3417 | |
3418 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3419 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3420 | |
3421 /* | |
3422 * Using inserted text works differently, because the register includes | |
3423 * special characters (newlines, etc.). | |
3424 */ | |
3425 if (regname == '.') | |
3426 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3427 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3428 stuffcharReadbuff(VIsual_mode); |
7 | 3429 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3430 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3431 /* Putting the text is done later, so can't really move the cursor to | |
3432 * the next character. Use "l" to simulate it. */ | |
3433 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3434 stuffcharReadbuff('l'); | |
3435 return; | |
3436 } | |
3437 | |
3438 /* | |
3439 * For special registers '%' (file name), '#' (alternate file name) and | |
3440 * ':' (last command line), etc. we have to create a fake yank register. | |
3441 */ | |
3442 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3443 { | |
3444 if (insert_string == NULL) | |
3445 return; | |
3446 } | |
3447 | |
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3448 /* 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
|
3449 * 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
|
3450 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
|
3451 goto end; |
4005 | 3452 |
7 | 3453 if (insert_string != NULL) |
3454 { | |
3455 y_type = MCHAR; | |
3456 #ifdef FEAT_EVAL | |
3457 if (regname == '=') | |
3458 { | |
3459 /* For the = register we need to split the string at NL | |
3093 | 3460 * characters. |
3461 * Loop twice: count the number of lines and save them. */ | |
7 | 3462 for (;;) |
3463 { | |
3464 y_size = 0; | |
3465 ptr = insert_string; | |
3466 while (ptr != NULL) | |
3467 { | |
3468 if (y_array != NULL) | |
3469 y_array[y_size] = ptr; | |
3470 ++y_size; | |
3471 ptr = vim_strchr(ptr, '\n'); | |
3472 if (ptr != NULL) | |
3473 { | |
3474 if (y_array != NULL) | |
3475 *ptr = NUL; | |
3476 ++ptr; | |
3093 | 3477 /* A trailing '\n' makes the register linewise. */ |
7 | 3478 if (*ptr == NUL) |
3479 { | |
3480 y_type = MLINE; | |
3481 break; | |
3482 } | |
3483 } | |
3484 } | |
3485 if (y_array != NULL) | |
3486 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
|
3487 y_array = ALLOC_MULT(char_u *, y_size); |
7 | 3488 if (y_array == NULL) |
3489 goto end; | |
3490 } | |
3491 } | |
3492 else | |
3493 #endif | |
3494 { | |
3495 y_size = 1; /* use fake one-line yank register */ | |
3496 y_array = &insert_string; | |
3497 } | |
3498 } | |
3499 else | |
3500 { | |
3501 get_yank_register(regname, FALSE); | |
3502 | |
3503 y_type = y_current->y_type; | |
3504 y_width = y_current->y_width; | |
3505 y_size = y_current->y_size; | |
3506 y_array = y_current->y_array; | |
3507 } | |
3508 | |
3509 if (y_type == MLINE) | |
3510 { | |
3511 if (flags & PUT_LINE_SPLIT) | |
3512 { | |
6845 | 3513 char_u *p; |
3514 | |
7 | 3515 /* "p" or "P" in Visual mode: split the lines to put the text in |
3516 * between. */ | |
3517 if (u_save_cursor() == FAIL) | |
3518 goto end; | |
6845 | 3519 p = ml_get_cursor(); |
3520 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
|
3521 MB_PTR_ADV(p); |
6845 | 3522 ptr = vim_strsave(p); |
7 | 3523 if (ptr == NULL) |
3524 goto end; | |
3525 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3526 vim_free(ptr); | |
3527 | |
6845 | 3528 oldp = ml_get_curline(); |
3529 p = oldp + curwin->w_cursor.col; | |
3530 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
|
3531 MB_PTR_ADV(p); |
6845 | 3532 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3533 if (ptr == NULL) |
3534 goto end; | |
3535 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3536 ++nr_lines; | |
3537 dir = FORWARD; | |
3538 } | |
3539 if (flags & PUT_LINE_FORWARD) | |
3540 { | |
3541 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3542 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3543 dir = FORWARD; |
3544 } | |
3545 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3546 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3547 } | |
3548 | |
3549 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3550 y_type = MLINE; | |
3551 | |
3552 if (y_size == 0 || y_array == NULL) | |
3553 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3554 semsg(_("E353: Nothing in register %s"), |
7 | 3555 regname == 0 ? (char_u *)"\"" : transchar(regname)); |
3556 goto end; | |
3557 } | |
3558 | |
3559 if (y_type == MBLOCK) | |
3560 { | |
3561 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3562 if (lnum > curbuf->b_ml.ml_line_count) | |
3563 lnum = curbuf->b_ml.ml_line_count + 1; | |
3564 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3565 goto end; | |
3566 } | |
5735 | 3567 else if (y_type == MLINE) |
7 | 3568 { |
3569 lnum = curwin->w_cursor.lnum; | |
3570 #ifdef FEAT_FOLDING | |
3571 /* Correct line number for closed fold. Don't move the cursor yet, | |
3572 * u_save() uses it. */ | |
3573 if (dir == BACKWARD) | |
3574 (void)hasFolding(lnum, &lnum, NULL); | |
3575 else | |
3576 (void)hasFolding(lnum, NULL, &lnum); | |
3577 #endif | |
3578 if (dir == FORWARD) | |
3579 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3580 /* 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
|
3581 * 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
|
3582 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3583 goto end; |
3584 #ifdef FEAT_FOLDING | |
3585 if (dir == FORWARD) | |
3586 curwin->w_cursor.lnum = lnum - 1; | |
3587 else | |
3588 curwin->w_cursor.lnum = lnum; | |
3589 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3590 #endif | |
3591 } | |
3592 else if (u_save_cursor() == FAIL) | |
3593 goto end; | |
3594 | |
3595 yanklen = (int)STRLEN(y_array[0]); | |
3596 | |
3597 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3598 { | |
3599 if (gchar_cursor() == TAB) | |
3600 { | |
3601 /* Don't need to insert spaces when "p" on the last position of a | |
3602 * 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
|
3603 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3604 int viscol = getviscol(); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3605 if (dir == FORWARD |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3606 ? 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
|
3607 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
|
3608 : 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
|
3609 coladvance_force(viscol); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3610 #else |
7 | 3611 if (dir == FORWARD |
3612 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3613 : curwin->w_cursor.coladd > 0) | |
3614 coladvance_force(getviscol()); | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3615 #endif |
7 | 3616 else |
3617 curwin->w_cursor.coladd = 0; | |
3618 } | |
3619 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3620 coladvance_force(getviscol() + (dir == FORWARD)); | |
3621 } | |
3622 | |
3623 lnum = curwin->w_cursor.lnum; | |
3624 col = curwin->w_cursor.col; | |
3625 | |
3626 /* | |
3627 * Block mode | |
3628 */ | |
3629 if (y_type == MBLOCK) | |
3630 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3631 int c = gchar_cursor(); |
7 | 3632 colnr_T endcol2 = 0; |
3633 | |
3634 if (dir == FORWARD && c != NUL) | |
3635 { | |
3636 if (ve_flags == VE_ALL) | |
3637 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3638 else | |
3639 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3640 | |
3641 if (has_mbyte) | |
3642 /* move to start of next multi-byte character */ | |
474 | 3643 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3644 else |
3645 if (c != TAB || ve_flags != VE_ALL) | |
3646 ++curwin->w_cursor.col; | |
3647 ++col; | |
3648 } | |
3649 else | |
3650 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3651 | |
3652 col += curwin->w_cursor.coladd; | |
1304 | 3653 if (ve_flags == VE_ALL |
3654 && (curwin->w_cursor.coladd > 0 | |
3655 || endcol2 == curwin->w_cursor.col)) | |
7 | 3656 { |
3657 if (dir == FORWARD && c == NUL) | |
3658 ++col; | |
3659 if (dir != FORWARD && c != NUL) | |
3660 ++curwin->w_cursor.col; | |
3661 if (c == TAB) | |
3662 { | |
3663 if (dir == BACKWARD && curwin->w_cursor.col) | |
3664 curwin->w_cursor.col--; | |
3665 if (dir == FORWARD && col - 1 == endcol2) | |
3666 curwin->w_cursor.col++; | |
3667 } | |
3668 } | |
3669 curwin->w_cursor.coladd = 0; | |
699 | 3670 bd.textcol = 0; |
7 | 3671 for (i = 0; i < y_size; ++i) |
3672 { | |
3673 int spaces; | |
3674 char shortline; | |
3675 | |
3676 bd.startspaces = 0; | |
3677 bd.endspaces = 0; | |
3678 vcol = 0; | |
3679 delcount = 0; | |
3680 | |
3681 /* add a new line */ | |
3682 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3683 { | |
3684 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3685 (colnr_T)1, FALSE) == FAIL) | |
3686 break; | |
3687 ++nr_lines; | |
3688 } | |
3689 /* get the old line and advance to the position to insert at */ | |
3690 oldp = ml_get_curline(); | |
3691 oldlen = (int)STRLEN(oldp); | |
3692 for (ptr = oldp; vcol < col && *ptr; ) | |
3693 { | |
3694 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3695 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3696 vcol += incr; |
3697 } | |
3698 bd.textcol = (colnr_T)(ptr - oldp); | |
3699 | |
3700 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3701 | |
3702 if (vcol < col) /* line too short, padd with spaces */ | |
3703 bd.startspaces = col - vcol; | |
3704 else if (vcol > col) | |
3705 { | |
3706 bd.endspaces = vcol - col; | |
3707 bd.startspaces = incr - bd.endspaces; | |
3708 --bd.textcol; | |
3709 delcount = 1; | |
3710 if (has_mbyte) | |
3711 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3712 if (oldp[bd.textcol] != TAB) | |
3713 { | |
3714 /* Only a Tab can be split into spaces. Other | |
3715 * characters will have to be moved to after the | |
3716 * block, causing misalignment. */ | |
3717 delcount = 0; | |
3718 bd.endspaces = 0; | |
3719 } | |
3720 } | |
3721 | |
3722 yanklen = (int)STRLEN(y_array[i]); | |
3723 | |
3724 /* calculate number of spaces required to fill right side of block*/ | |
3725 spaces = y_width + 1; | |
3726 for (j = 0; j < yanklen; j++) | |
5995 | 3727 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3728 if (spaces < 0) |
3729 spaces = 0; | |
3730 | |
3731 /* insert the new text */ | |
3732 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
|
3733 newp = alloc(totlen + oldlen + 1); |
7 | 3734 if (newp == NULL) |
3735 break; | |
3736 /* copy part up to cursor to new line */ | |
3737 ptr = newp; | |
3738 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3739 ptr += bd.textcol; | |
3740 /* may insert some spaces before the new text */ | |
6929 | 3741 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3742 ptr += bd.startspaces; |
3743 /* insert the new text */ | |
3744 for (j = 0; j < count; ++j) | |
3745 { | |
3746 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3747 ptr += yanklen; | |
3748 | |
3749 /* insert block's trailing spaces only if there's text behind */ | |
3750 if ((j < count - 1 || !shortline) && spaces) | |
3751 { | |
6929 | 3752 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3753 ptr += spaces; |
3754 } | |
3755 } | |
3756 /* may insert some spaces after the new text */ | |
6929 | 3757 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3758 ptr += bd.endspaces; |
3759 /* move the text after the cursor to the end of the line. */ | |
3760 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3761 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3762 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3763 | |
3764 ++curwin->w_cursor.lnum; | |
3765 if (i == 0) | |
3766 curwin->w_cursor.col += bd.startspaces; | |
3767 } | |
3768 | |
3769 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3770 | |
3771 /* Set '[ mark. */ | |
3772 curbuf->b_op_start = curwin->w_cursor; | |
3773 curbuf->b_op_start.lnum = lnum; | |
3774 | |
3775 /* adjust '] mark */ | |
3776 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3777 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
3778 curbuf->b_op_end.coladd = 0; | |
3779 if (flags & PUT_CURSEND) | |
3780 { | |
916 | 3781 colnr_T len; |
3782 | |
7 | 3783 curwin->w_cursor = curbuf->b_op_end; |
3784 curwin->w_cursor.col++; | |
916 | 3785 |
3786 /* in Insert mode we might be after the NUL, correct for that */ | |
3787 len = (colnr_T)STRLEN(ml_get_curline()); | |
3788 if (curwin->w_cursor.col > len) | |
3789 curwin->w_cursor.col = len; | |
7 | 3790 } |
3791 else | |
3792 curwin->w_cursor.lnum = lnum; | |
3793 } | |
3794 else | |
3795 { | |
3796 /* | |
3797 * Character or Line mode | |
3798 */ | |
3799 if (y_type == MCHAR) | |
3800 { | |
3801 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3802 * char */ | |
3803 if (dir == FORWARD && gchar_cursor() != NUL) | |
3804 { | |
3805 if (has_mbyte) | |
3806 { | |
474 | 3807 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3808 |
3809 /* put it on the next of the multi-byte character. */ | |
3810 col += bytelen; | |
3811 if (yanklen) | |
3812 { | |
3813 curwin->w_cursor.col += bytelen; | |
3814 curbuf->b_op_end.col += bytelen; | |
3815 } | |
3816 } | |
3817 else | |
3818 { | |
3819 ++col; | |
3820 if (yanklen) | |
3821 { | |
3822 ++curwin->w_cursor.col; | |
3823 ++curbuf->b_op_end.col; | |
3824 } | |
3825 } | |
3826 } | |
3827 curbuf->b_op_start = curwin->w_cursor; | |
3828 } | |
3829 /* | |
3830 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3831 */ | |
3832 else if (dir == BACKWARD) | |
3833 --lnum; | |
699 | 3834 new_cursor = curwin->w_cursor; |
7 | 3835 |
3836 /* | |
3837 * simple case: insert into current line | |
3838 */ | |
3839 if (y_type == MCHAR && y_size == 1) | |
3840 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3841 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
|
3842 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3843 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3844 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3845 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
|
3846 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
|
3847 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
|
3848 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3849 |
5365 | 3850 do { |
3851 totlen = count * yanklen; | |
3852 if (totlen > 0) | |
7 | 3853 { |
5365 | 3854 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
|
3855 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
|
3856 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3857 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3858 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3859 } |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
3860 newp = alloc(STRLEN(oldp) + totlen + 1); |
5365 | 3861 if (newp == NULL) |
3862 goto end; /* alloc() gave an error message */ | |
3863 mch_memmove(newp, oldp, (size_t)col); | |
3864 ptr = newp + col; | |
3865 for (i = 0; i < count; ++i) | |
3866 { | |
3867 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3868 ptr += yanklen; | |
3869 } | |
3870 STRMOVE(ptr, oldp + col); | |
3871 ml_replace(lnum, newp, FALSE); | |
3872 /* Place cursor on last putted char. */ | |
3873 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3874 { |
3875 /* make sure curwin->w_virtcol is updated */ | |
3876 changed_cline_bef_curs(); | |
5365 | 3877 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3878 } |
7 | 3879 } |
5365 | 3880 if (VIsual_active) |
3881 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3882 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3883 |
6379 | 3884 if (VIsual_active) /* reset lnum to the last visual line */ |
3885 lnum--; | |
3886 | |
7 | 3887 curbuf->b_op_end = curwin->w_cursor; |
3888 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3889 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3890 ++curwin->w_cursor.col; | |
3891 changed_bytes(lnum, col); | |
3892 } | |
3893 else | |
3894 { | |
3895 /* | |
3896 * Insert at least one line. When y_type is MCHAR, break the first | |
3897 * line in two. | |
3898 */ | |
3899 for (cnt = 1; cnt <= count; ++cnt) | |
3900 { | |
3901 i = 0; | |
3902 if (y_type == MCHAR) | |
3903 { | |
3904 /* | |
3905 * Split the current line in two at the insert position. | |
3906 * First insert y_array[size - 1] in front of second line. | |
3907 * Then append y_array[0] to first line. | |
3908 */ | |
3909 lnum = new_cursor.lnum; | |
3910 ptr = ml_get(lnum) + col; | |
3911 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
|
3912 newp = alloc(STRLEN(ptr) + totlen + 1); |
7 | 3913 if (newp == NULL) |
3914 goto error; | |
3915 STRCPY(newp, y_array[y_size - 1]); | |
3916 STRCAT(newp, ptr); | |
3917 /* insert second line */ | |
3918 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3919 vim_free(newp); | |
3920 | |
3921 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
|
3922 newp = alloc(col + yanklen + 1); |
7 | 3923 if (newp == NULL) |
3924 goto error; | |
3925 /* copy first part of line */ | |
3926 mch_memmove(newp, oldp, (size_t)col); | |
3927 /* append to first line */ | |
3928 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3929 ml_replace(lnum, newp, FALSE); | |
3930 | |
3931 curwin->w_cursor.lnum = lnum; | |
3932 i = 1; | |
3933 } | |
3934 | |
3935 for (; i < y_size; ++i) | |
3936 { | |
3937 if ((y_type != MCHAR || i < y_size - 1) | |
3938 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3939 == FAIL) | |
3940 goto error; | |
3941 lnum++; | |
3942 ++nr_lines; | |
3943 if (flags & PUT_FIXINDENT) | |
3944 { | |
3945 old_pos = curwin->w_cursor; | |
3946 curwin->w_cursor.lnum = lnum; | |
3947 ptr = ml_get(lnum); | |
3948 if (cnt == count && i == y_size - 1) | |
3949 lendiff = (int)STRLEN(ptr); | |
3950 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3951 if (*ptr == '#' && preprocs_left()) | |
3952 indent = 0; /* Leave # lines at start */ | |
3953 else | |
3954 #endif | |
3955 if (*ptr == NUL) | |
3956 indent = 0; /* Ignore empty lines */ | |
3957 else if (first_indent) | |
3958 { | |
3959 indent_diff = orig_indent - get_indent(); | |
3960 indent = orig_indent; | |
3961 first_indent = FALSE; | |
3962 } | |
3963 else if ((indent = get_indent() + indent_diff) < 0) | |
3964 indent = 0; | |
3965 (void)set_indent(indent, 0); | |
3966 curwin->w_cursor = old_pos; | |
3967 /* remember how many chars were removed */ | |
3968 if (cnt == count && i == y_size - 1) | |
3969 lendiff -= (int)STRLEN(ml_get(lnum)); | |
3970 } | |
3971 } | |
3972 } | |
3973 | |
3974 error: | |
3975 /* Adjust marks. */ | |
3976 if (y_type == MLINE) | |
3977 { | |
3978 curbuf->b_op_start.col = 0; | |
3979 if (dir == FORWARD) | |
3980 curbuf->b_op_start.lnum++; | |
3981 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3982 /* 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
|
3983 * 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
|
3984 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
|
3985 < 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
|
3986 #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
|
3987 || 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
|
3988 #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
|
3989 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3990 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 3991 (linenr_T)MAXLNUM, nr_lines, 0L); |
3992 | |
3993 /* note changed text for displaying and folding */ | |
3994 if (y_type == MCHAR) | |
3995 changed_lines(curwin->w_cursor.lnum, col, | |
3996 curwin->w_cursor.lnum + 1, nr_lines); | |
3997 else | |
3998 changed_lines(curbuf->b_op_start.lnum, 0, | |
3999 curbuf->b_op_start.lnum, nr_lines); | |
4000 | |
4001 /* put '] mark at last inserted character */ | |
4002 curbuf->b_op_end.lnum = lnum; | |
4003 /* correct length for change in indent */ | |
4004 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4005 if (col > 1) | |
4006 curbuf->b_op_end.col = col - 1; | |
4007 else | |
4008 curbuf->b_op_end.col = 0; | |
4009 | |
168 | 4010 if (flags & PUT_CURSLINE) |
4011 { | |
237 | 4012 /* ":put": put cursor on last inserted line */ |
168 | 4013 curwin->w_cursor.lnum = lnum; |
4014 beginline(BL_WHITE | BL_FIX); | |
4015 } | |
4016 else if (flags & PUT_CURSEND) | |
7 | 4017 { |
4018 /* put cursor after inserted text */ | |
4019 if (y_type == MLINE) | |
4020 { | |
4021 if (lnum >= curbuf->b_ml.ml_line_count) | |
4022 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4023 else | |
4024 curwin->w_cursor.lnum = lnum + 1; | |
4025 curwin->w_cursor.col = 0; | |
4026 } | |
4027 else | |
4028 { | |
4029 curwin->w_cursor.lnum = lnum; | |
4030 curwin->w_cursor.col = col; | |
4031 } | |
4032 } | |
4033 else if (y_type == MLINE) | |
4034 { | |
168 | 4035 /* put cursor on first non-blank in first inserted line */ |
7 | 4036 curwin->w_cursor.col = 0; |
4037 if (dir == FORWARD) | |
4038 ++curwin->w_cursor.lnum; | |
4039 beginline(BL_WHITE | BL_FIX); | |
4040 } | |
4041 else /* put cursor on first inserted character */ | |
4042 curwin->w_cursor = new_cursor; | |
4043 } | |
4044 } | |
4045 | |
4046 msgmore(nr_lines); | |
4047 curwin->w_set_curswant = TRUE; | |
4048 | |
4049 end: | |
4050 if (allocated) | |
4051 vim_free(insert_string); | |
840 | 4052 if (regname == '=') |
4053 vim_free(y_array); | |
4054 | |
5380 | 4055 VIsual_active = FALSE; |
4056 | |
140 | 4057 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4058 adjust_cursor_eol(); |
4059 } | |
4060 | |
4061 /* | |
4062 * When the cursor is on the NUL past the end of the line and it should not be | |
4063 * there move it left. | |
4064 */ | |
4065 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4066 adjust_cursor_eol(void) |
844 | 4067 { |
4068 if (curwin->w_cursor.col > 0 | |
4069 && gchar_cursor() == NUL | |
773 | 4070 && (ve_flags & VE_ONEMORE) == 0 |
7 | 4071 && !(restart_edit || (State & INSERT))) |
4072 { | |
557 | 4073 /* Put the cursor on the last character in the line. */ |
555 | 4074 dec_cursor(); |
844 | 4075 |
7 | 4076 if (ve_flags == VE_ALL) |
557 | 4077 { |
4078 colnr_T scol, ecol; | |
4079 | |
4080 /* Coladd is set to the width of the last character. */ | |
4081 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4082 curwin->w_cursor.coladd = ecol - scol + 1; | |
4083 } | |
7 | 4084 } |
4085 } | |
4086 | |
4087 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4088 /* | |
4089 * Return TRUE if lines starting with '#' should be left aligned. | |
4090 */ | |
4091 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4092 preprocs_left(void) |
7 | 4093 { |
4094 return | |
4095 # ifdef FEAT_SMARTINDENT | |
4096 # ifdef FEAT_CINDENT | |
4097 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4098 # else | |
4099 curbuf->b_p_si | |
4100 # endif | |
4101 # endif | |
4102 # ifdef FEAT_CINDENT | |
5438 | 4103 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4104 && curbuf->b_ind_hash_comment == 0) | |
7 | 4105 # endif |
4106 ; | |
4107 } | |
4108 #endif | |
4109 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4110 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4111 * 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
|
4112 */ |
7 | 4113 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4114 get_register_name(int num) |
7 | 4115 { |
4116 if (num == -1) | |
4117 return '"'; | |
4118 else if (num < 10) | |
4119 return num + '0'; | |
4120 else if (num == DELETION_REGISTER) | |
4121 return '-'; | |
4122 #ifdef FEAT_CLIPBOARD | |
4123 else if (num == STAR_REGISTER) | |
4124 return '*'; | |
4125 else if (num == PLUS_REGISTER) | |
4126 return '+'; | |
4127 #endif | |
4128 else | |
4129 { | |
4130 #ifdef EBCDIC | |
4131 int i; | |
4132 | |
4133 /* EBCDIC is really braindead ... */ | |
4134 i = 'a' + (num - 10); | |
4135 if (i > 'i') | |
4136 i += 7; | |
4137 if (i > 'r') | |
4138 i += 8; | |
4139 return i; | |
4140 #else | |
4141 return num + 'a' - 10; | |
4142 #endif | |
4143 } | |
4144 } | |
4145 | |
4146 /* | |
4147 * ":dis" and ":registers": Display the contents of the yank registers. | |
4148 */ | |
4149 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4150 ex_display(exarg_T *eap) |
7 | 4151 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4152 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4153 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4154 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4155 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4156 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4157 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4158 char_u *arg = eap->arg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4159 int clen; |
7 | 4160 |
4161 if (arg != NULL && *arg == NUL) | |
4162 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4163 attr = HL_ATTR(HLF_8); |
7 | 4164 |
4165 /* Highlight title */ | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4166 msg_puts_title(_("\n--- Registers ---")); |
7 | 4167 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) |
4168 { | |
4169 name = get_register_name(i); | |
2644 | 4170 if (arg != NULL && vim_strchr(arg, name) == NULL |
4171 #ifdef ONE_CLIPBOARD | |
4172 /* Star register and plus register contain the same thing. */ | |
4173 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4174 #endif | |
4175 ) | |
7 | 4176 continue; /* did not ask for this register */ |
4177 | |
4178 #ifdef FEAT_CLIPBOARD | |
4179 /* Adjust register name for "unnamed" in 'clipboard'. | |
4180 * When it's a clipboard register, fill it with the current contents | |
4181 * of the clipboard. */ | |
4182 adjust_clip_reg(&name); | |
4183 (void)may_get_selection(name); | |
4184 #endif | |
4185 | |
4186 if (i == -1) | |
4187 { | |
4188 if (y_previous != NULL) | |
4189 yb = y_previous; | |
4190 else | |
4191 yb = &(y_regs[0]); | |
4192 } | |
4193 else | |
4194 yb = &(y_regs[i]); | |
2000 | 4195 |
4196 #ifdef FEAT_EVAL | |
4197 if (name == MB_TOLOWER(redir_reg) | |
4198 || (redir_reg == '"' && yb == y_previous)) | |
4199 continue; /* do not list register being written to, the | |
4200 * pointer can be freed */ | |
4201 #endif | |
4202 | |
7 | 4203 if (yb->y_array != NULL) |
4204 { | |
4205 msg_putchar('\n'); | |
4206 msg_putchar('"'); | |
4207 msg_putchar(name); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4208 msg_puts(" "); |
7 | 4209 |
4210 n = (int)Columns - 6; | |
4211 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4212 { | |
4213 if (j) | |
4214 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4215 msg_puts_attr("^J", attr); |
7 | 4216 n -= 2; |
4217 } | |
4218 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4219 { | |
474 | 4220 clen = (*mb_ptr2len)(p); |
22 | 4221 msg_outtrans_len(p, clen); |
4222 p += clen - 1; | |
7 | 4223 } |
4224 } | |
4225 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
|
4226 msg_puts_attr("^J", attr); |
7 | 4227 out_flush(); /* show one line at a time */ |
4228 } | |
4229 ui_breakcheck(); | |
4230 } | |
4231 | |
4232 /* | |
4233 * display last inserted text | |
4234 */ | |
4235 if ((p = get_last_insert()) != NULL | |
4236 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4237 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4238 msg_puts("\n\". "); |
7 | 4239 dis_msg(p, TRUE); |
4240 } | |
4241 | |
4242 /* | |
4243 * display last command line | |
4244 */ | |
4245 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4246 && !got_int) | |
4247 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4248 msg_puts("\n\": "); |
7 | 4249 dis_msg(last_cmdline, FALSE); |
4250 } | |
4251 | |
4252 /* | |
4253 * display current file name | |
4254 */ | |
4255 if (curbuf->b_fname != NULL | |
4256 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4257 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4258 msg_puts("\n\"% "); |
7 | 4259 dis_msg(curbuf->b_fname, FALSE); |
4260 } | |
4261 | |
4262 /* | |
4263 * display alternate file name | |
4264 */ | |
4265 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4266 { | |
4267 char_u *fname; | |
4268 linenr_T dummy; | |
4269 | |
4270 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4271 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4272 msg_puts("\n\"# "); |
7 | 4273 dis_msg(fname, FALSE); |
4274 } | |
4275 } | |
4276 | |
4277 /* | |
4278 * display last search pattern | |
4279 */ | |
4280 if (last_search_pat() != NULL | |
4281 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4282 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4283 msg_puts("\n\"/ "); |
7 | 4284 dis_msg(last_search_pat(), FALSE); |
4285 } | |
4286 | |
4287 #ifdef FEAT_EVAL | |
4288 /* | |
4289 * display last used expression | |
4290 */ | |
4291 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4292 && !got_int) | |
4293 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4294 msg_puts("\n\"= "); |
7 | 4295 dis_msg(expr_line, FALSE); |
4296 } | |
4297 #endif | |
4298 } | |
4299 | |
4300 /* | |
4301 * display a string for do_dis() | |
4302 * truncate at end of screen line | |
4303 */ | |
4304 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4305 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4306 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4307 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4308 { |
4309 int n; | |
4310 int l; | |
4311 | |
4312 n = (int)Columns - 6; | |
4313 while (*p != NUL | |
4314 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4315 && (n -= ptr2cells(p)) >= 0) | |
4316 { | |
474 | 4317 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4318 { |
4319 msg_outtrans_len(p, l); | |
4320 p += l; | |
4321 } | |
4322 else | |
4323 msg_outtrans_len(p++, 1); | |
4324 } | |
4325 ui_breakcheck(); | |
4326 } | |
4327 | |
3562 | 4328 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4329 /* | |
4330 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4331 * after some white space), return a pointer to the text after it. Put a boolean | |
4332 * value indicating whether the line ends with an unclosed comment in | |
4333 * "is_comment". | |
4334 * line - line to be processed, | |
4335 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4336 * comment, |
3562 | 4337 * include_space - whether to also skip space following the comment leader, |
4338 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4339 * comment. |
3562 | 4340 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4341 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4342 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4343 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4344 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4345 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4346 int *is_comment) |
3562 | 4347 { |
4348 char_u *comment_flags = NULL; | |
4349 int lead_len; | |
4350 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4351 | |
4352 *is_comment = FALSE; | |
4353 if (leader_offset != -1) | |
4354 { | |
4355 /* Let's check whether the line ends with an unclosed comment. | |
4356 * If the last comment leader has COM_END in flags, there's no comment. | |
4357 */ | |
4358 while (*comment_flags) | |
4359 { | |
4360 if (*comment_flags == COM_END | |
4361 || *comment_flags == ':') | |
4362 break; | |
4363 ++comment_flags; | |
4364 } | |
4365 if (*comment_flags != COM_END) | |
4366 *is_comment = TRUE; | |
4367 } | |
4368 | |
4369 if (process == FALSE) | |
4370 return line; | |
4371 | |
4372 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4373 | |
4374 if (lead_len == 0) | |
4375 return line; | |
4376 | |
4377 /* Find: | |
4378 * - COM_END, | |
4379 * - colon, | |
4380 * whichever comes first. | |
4381 */ | |
4382 while (*comment_flags) | |
4383 { | |
3580 | 4384 if (*comment_flags == COM_END |
3562 | 4385 || *comment_flags == ':') |
4386 break; | |
4387 ++comment_flags; | |
4388 } | |
4389 | |
4390 /* If we found a colon, it means that we are not processing a line | |
3580 | 4391 * starting with a closing part of a three-part comment. That's good, |
4392 * because we don't want to remove those as this would be annoying. | |
3562 | 4393 */ |
4394 if (*comment_flags == ':' || *comment_flags == NUL) | |
4395 line += lead_len; | |
4396 | |
4397 return line; | |
4398 } | |
4399 #endif | |
4400 | |
7 | 4401 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4402 * 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
|
4403 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4404 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4405 * leaders should not be removed. | |
4406 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4407 * to set those marks. | |
7 | 4408 * |
1217 | 4409 * return FAIL for failure, OK otherwise |
7 | 4410 */ |
4411 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4412 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4413 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4414 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4415 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4416 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4417 int setmark) |
7 | 4418 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4419 char_u *curr = NULL; |
2597 | 4420 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
|
4421 char_u *cend; |
7 | 4422 char_u *newp; |
2597 | 4423 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
|
4424 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4425 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4426 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
|
4427 int sumsize = 0; /* size of the long new line */ |
7 | 4428 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4429 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4430 int ret = OK; |
3562 | 4431 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4432 int *comments = NULL; |
3562 | 4433 int remove_comments = (use_formatoptions == TRUE) |
4434 && has_format_option(FO_REMOVE_COMS); | |
4435 int prev_was_comment; | |
4436 #endif | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4437 #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
|
4438 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
|
4439 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
|
4440 #endif |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4441 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4442 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
|
4443 (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
|
4444 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4445 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4446 /* 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
|
4447 * 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
|
4448 * 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
|
4449 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
|
4450 if (spaces == NULL) |
7 | 4451 return FAIL; |
3562 | 4452 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4453 if (remove_comments) | |
4454 { | |
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
|
4455 comments = lalloc_clear(count * sizeof(int), TRUE); |
3562 | 4456 if (comments == NULL) |
4457 { | |
4458 vim_free(spaces); | |
4459 return FAIL; | |
4460 } | |
4461 } | |
4462 #endif | |
7 | 4463 |
4464 /* | |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4465 * 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
|
4466 * 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
|
4467 * This loops forward over the joined lines. |
7 | 4468 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4469 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
|
4470 { |
2597 | 4471 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4472 if (t == 0 && setmark) |
5664 | 4473 { |
4474 /* Set the '[ mark. */ | |
4475 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4476 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4477 } | |
3562 | 4478 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4479 if (remove_comments) | |
4480 { | |
4481 /* We don't want to remove the comment leader if the | |
4482 * previous line is not a comment. */ | |
4483 if (t > 0 && prev_was_comment) | |
4484 { | |
4485 | |
4486 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4487 &prev_was_comment); | |
3576 | 4488 comments[t] = (int)(new_curr - curr); |
3562 | 4489 curr = new_curr; |
4490 } | |
4491 else | |
4492 curr = skip_comment(curr, FALSE, insert_space, | |
4493 &prev_was_comment); | |
4494 } | |
4495 #endif | |
4496 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4497 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
|
4498 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4499 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 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
|
4501 && (!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
|
4502 || (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
|
4503 && (!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
|
4504 || 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
|
4505 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 /* 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
|
4508 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4511 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 /* 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
|
4513 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 || (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
|
4516 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4517 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 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
|
4524 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4527 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4528 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
|
4529 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4531 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4532 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4535 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4536 else |
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 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4541 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4544 if (got_int) |
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 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 goto theend; |
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 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 /* 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
|
4552 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
|
4553 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 /* 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
|
4555 newp = alloc(sumsize + 1); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4556 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4557 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4558 |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4559 #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
|
4560 // 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
|
4561 // 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
|
4562 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
|
4563 { |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4564 // 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
|
4565 // 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
|
4566 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
|
4567 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
|
4568 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
|
4569 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
|
4570 } |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4571 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4572 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4573 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4574 * 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
|
4575 * 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
|
4576 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4577 * 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
|
4578 * 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
|
4579 * 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
|
4580 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 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
|
4582 { |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4583 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
|
4584 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4586 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
|
4587 if (spaces[t] > 0) |
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 cend -= spaces[t]; |
6929 | 4590 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
|
4591 } |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4592 |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4593 // 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
|
4594 // 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
|
4595 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
|
4596 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 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
|
4598 (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
|
4599 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4600 break; |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4601 #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
|
4602 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
|
4603 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
|
4604 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
|
4605 (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
|
4606 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4607 |
2597 | 4608 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
|
4609 #if defined(FEAT_COMMENTS) |
3562 | 4610 if (remove_comments) |
4611 curr += comments[t - 1]; | |
4612 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4613 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
|
4614 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4615 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4616 } |
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4617 |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4618 #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
|
4619 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
|
4620 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
|
4621 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
|
4622 else |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4623 #endif |
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4624 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
7 | 4625 |
5848 | 4626 if (setmark) |
4627 { | |
4628 /* Set the '] mark. */ | |
4629 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
|
4630 curwin->w_buffer->b_op_end.col = (colnr_T)sumsize; |
5848 | 4631 } |
5664 | 4632 |
7 | 4633 /* Only report the change in the first line here, del_lines() will report |
4634 * the deleted line. */ | |
4635 changed_lines(curwin->w_cursor.lnum, currsize, | |
4636 curwin->w_cursor.lnum + 1, 0L); | |
4637 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4638 * Delete following lines. To do this we move the cursor there |
7 | 4639 * briefly, and then move it back. After del_lines() the cursor may |
4640 * have moved up (last line deleted), so the current lnum is kept in t. | |
4641 */ | |
4642 t = curwin->w_cursor.lnum; | |
4643 ++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
|
4644 del_lines(count - 1, FALSE); |
7 | 4645 curwin->w_cursor.lnum = t; |
4646 | |
4647 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4648 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4649 * 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
|
4650 * vim: use the column of the last join |
7 | 4651 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4653 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4654 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4655 |
7 | 4656 curwin->w_cursor.coladd = 0; |
4657 curwin->w_set_curswant = TRUE; | |
4658 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4659 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4660 vim_free(spaces); |
3562 | 4661 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4662 if (remove_comments) | |
4663 vim_free(comments); | |
4664 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4665 return ret; |
7 | 4666 } |
4667 | |
4668 #ifdef FEAT_COMMENTS | |
4669 /* | |
4670 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4671 * the first line. White-space is ignored. Note that the whole of | |
4672 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4673 */ | |
4674 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4675 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4676 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4677 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4678 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4679 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4680 char_u *leader2_flags) |
7 | 4681 { |
4682 int idx1 = 0, idx2 = 0; | |
4683 char_u *p; | |
4684 char_u *line1; | |
4685 char_u *line2; | |
4686 | |
4687 if (leader1_len == 0) | |
4688 return (leader2_len == 0); | |
4689 | |
4690 /* | |
4691 * If first leader has 'f' flag, the lines can be joined only if the | |
4692 * second line does not have a leader. | |
4693 * If first leader has 'e' flag, the lines can never be joined. | |
4694 * If fist leader has 's' flag, the lines can only be joined if there is | |
4695 * some text after it and the second line has the 'm' flag. | |
4696 */ | |
4697 if (leader1_flags != NULL) | |
4698 { | |
4699 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4700 { | |
4701 if (*p == COM_FIRST) | |
4702 return (leader2_len == 0); | |
4703 if (*p == COM_END) | |
4704 return FALSE; | |
4705 if (*p == COM_START) | |
4706 { | |
4707 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4708 return FALSE; | |
4709 if (leader2_flags == NULL || leader2_len == 0) | |
4710 return FALSE; | |
4711 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4712 if (*p == COM_MIDDLE) | |
4713 return TRUE; | |
4714 return FALSE; | |
4715 } | |
4716 } | |
4717 } | |
4718 | |
4719 /* | |
4720 * Get current line and next line, compare the leaders. | |
4721 * The first line has to be saved, only one line can be locked at a time. | |
4722 */ | |
4723 line1 = vim_strsave(ml_get(lnum)); | |
4724 if (line1 != NULL) | |
4725 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4726 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4727 ; |
4728 line2 = ml_get(lnum + 1); | |
4729 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4730 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4731 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4732 { |
4733 if (line1[idx1++] != line2[idx2]) | |
4734 break; | |
4735 } | |
4736 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4737 while (VIM_ISWHITE(line1[idx1])) |
7 | 4738 ++idx1; |
4739 } | |
4740 vim_free(line1); | |
4741 } | |
4742 return (idx2 == leader2_len && idx1 == leader1_len); | |
4743 } | |
4744 #endif | |
4745 | |
4746 /* | |
3252 | 4747 * Implementation of the format operator 'gq'. |
7 | 4748 */ |
4749 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4750 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4751 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4752 int keep_cursor) /* keep cursor on same text char */ |
7 | 4753 { |
4754 long old_line_count = curbuf->b_ml.ml_line_count; | |
4755 | |
4756 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4757 * can put it back there. */ | |
4758 curwin->w_cursor = oap->cursor_start; | |
4759 | |
4760 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4761 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4762 return; | |
4763 curwin->w_cursor = oap->start; | |
4764 | |
4765 if (oap->is_VIsual) | |
4766 /* When there is no change: need to remove the Visual selection */ | |
4767 redraw_curbuf_later(INVERTED); | |
4768 | |
4769 /* Set '[ mark at the start of the formatted area */ | |
4770 curbuf->b_op_start = oap->start; | |
4771 | |
4772 /* For "gw" remember the cursor position and put it back below (adjusted | |
4773 * for joined and split lines). */ | |
4774 if (keep_cursor) | |
4775 saved_cursor = oap->cursor_start; | |
4776 | |
1563 | 4777 format_lines(oap->line_count, keep_cursor); |
7 | 4778 |
4779 /* | |
4780 * Leave the cursor at the first non-blank of the last formatted line. | |
4781 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4782 * line, so "." will do the next lines. | |
4783 */ | |
4784 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4785 ++curwin->w_cursor.lnum; | |
4786 beginline(BL_WHITE | BL_FIX); | |
4787 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4788 msgmore(old_line_count); | |
4789 | |
4790 /* put '] mark on the end of the formatted area */ | |
4791 curbuf->b_op_end = curwin->w_cursor; | |
4792 | |
4793 if (keep_cursor) | |
4794 { | |
4795 curwin->w_cursor = saved_cursor; | |
4796 saved_cursor.lnum = 0; | |
4797 } | |
4798 | |
4799 if (oap->is_VIsual) | |
4800 { | |
4801 win_T *wp; | |
4802 | |
4803 FOR_ALL_WINDOWS(wp) | |
4804 { | |
4805 if (wp->w_old_cursor_lnum != 0) | |
4806 { | |
4807 /* When lines have been inserted or deleted, adjust the end of | |
4808 * the Visual area to be redrawn. */ | |
4809 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4810 wp->w_old_cursor_lnum += old_line_count; | |
4811 else | |
4812 wp->w_old_visual_lnum += old_line_count; | |
4813 } | |
4814 } | |
4815 } | |
4816 } | |
4817 | |
667 | 4818 #if defined(FEAT_EVAL) || defined(PROTO) |
4819 /* | |
4820 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4821 */ | |
4822 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4823 op_formatexpr(oparg_T *oap) |
667 | 4824 { |
4825 if (oap->is_VIsual) | |
4826 /* When there is no change: need to remove the Visual selection */ | |
4827 redraw_curbuf_later(INVERTED); | |
4828 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4829 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
|
4830 /* 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
|
4831 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4832 op_format(oap, FALSE); |
667 | 4833 } |
4834 | |
4835 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4836 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4837 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4838 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4839 int c) /* character to be inserted */ |
667 | 4840 { |
681 | 4841 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4842 OPT_LOCAL); | |
667 | 4843 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4844 char_u *fex; |
667 | 4845 |
4846 /* | |
4847 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4848 * Set v:char to the character to be inserted (can be NUL). |
667 | 4849 */ |
4850 set_vim_var_nr(VV_LNUM, lnum); | |
4851 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4852 set_vim_var_char(c); |
844 | 4853 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4854 /* 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
|
4855 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
|
4856 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4857 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4858 |
667 | 4859 /* |
4860 * Evaluate the function. | |
4861 */ | |
4862 if (use_sandbox) | |
4863 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4864 r = (int)eval_to_number(fex); |
667 | 4865 if (use_sandbox) |
4866 --sandbox; | |
844 | 4867 |
4868 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
|
4869 vim_free(fex); |
844 | 4870 |
667 | 4871 return r; |
4872 } | |
4873 #endif | |
4874 | |
7 | 4875 /* |
4876 * Format "line_count" lines, starting at the cursor position. | |
4877 * When "line_count" is negative, format until the end of the paragraph. | |
4878 * Lines after the cursor line are saved for undo, caller must have saved the | |
4879 * first line. | |
4880 */ | |
4881 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4882 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4883 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4884 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4885 { |
4886 int max_len; | |
4887 int is_not_par; /* current line not part of parag. */ | |
4888 int next_is_not_par; /* next line not part of paragraph */ | |
4889 int is_end_par; /* at end of paragraph */ | |
4890 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4891 int next_is_start_par = FALSE; | |
4892 #ifdef FEAT_COMMENTS | |
4893 int leader_len = 0; /* leader len of current line */ | |
4894 int next_leader_len; /* leader len of next line */ | |
4895 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4896 char_u *next_leader_flags; /* flags for leader of next line */ | |
4897 int do_comments; /* format comments */ | |
3584 | 4898 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4899 #endif |
4900 int advance = TRUE; | |
3584 | 4901 int second_indent = -1; /* indent for second line (comment |
4902 * aware) */ | |
7 | 4903 int do_second_indent; |
4904 int do_number_indent; | |
4905 int do_trail_white; | |
4906 int first_par_line = TRUE; | |
4907 int smd_save; | |
4908 long count; | |
4909 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4910 int force_format = FALSE; | |
4911 int old_State = State; | |
4912 | |
4913 /* length of a line to force formatting: 3 * 'tw' */ | |
4914 max_len = comp_textwidth(TRUE) * 3; | |
4915 | |
4916 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4917 #ifdef FEAT_COMMENTS | |
4918 do_comments = has_format_option(FO_Q_COMS); | |
4919 #endif | |
4920 do_second_indent = has_format_option(FO_Q_SECOND); | |
4921 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4922 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4923 | |
4924 /* | |
4925 * Get info about the previous and current line. | |
4926 */ | |
4927 if (curwin->w_cursor.lnum > 1) | |
4928 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4929 #ifdef FEAT_COMMENTS | |
4930 , &leader_len, &leader_flags, do_comments | |
4931 #endif | |
4932 ); | |
4933 else | |
4934 is_not_par = TRUE; | |
4935 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4936 #ifdef FEAT_COMMENTS | |
4937 , &next_leader_len, &next_leader_flags, do_comments | |
4938 #endif | |
4939 ); | |
4940 is_end_par = (is_not_par || next_is_not_par); | |
4941 if (!is_end_par && do_trail_white) | |
4942 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4943 | |
4944 curwin->w_cursor.lnum--; | |
4945 for (count = line_count; count != 0 && !got_int; --count) | |
4946 { | |
4947 /* | |
4948 * Advance to next paragraph. | |
4949 */ | |
4950 if (advance) | |
4951 { | |
4952 curwin->w_cursor.lnum++; | |
4953 prev_is_end_par = is_end_par; | |
4954 is_not_par = next_is_not_par; | |
4955 #ifdef FEAT_COMMENTS | |
4956 leader_len = next_leader_len; | |
4957 leader_flags = next_leader_flags; | |
4958 #endif | |
4959 } | |
4960 | |
4961 /* | |
4962 * The last line to be formatted. | |
4963 */ | |
4964 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4965 { | |
4966 next_is_not_par = TRUE; | |
4967 #ifdef FEAT_COMMENTS | |
4968 next_leader_len = 0; | |
4969 next_leader_flags = NULL; | |
4970 #endif | |
4971 } | |
4972 else | |
4973 { | |
4974 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
4975 #ifdef FEAT_COMMENTS | |
4976 , &next_leader_len, &next_leader_flags, do_comments | |
4977 #endif | |
4978 ); | |
4979 if (do_number_indent) | |
4980 next_is_start_par = | |
4981 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
4982 } | |
4983 advance = TRUE; | |
4984 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
4985 if (!is_end_par && do_trail_white) | |
4986 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
4987 | |
4988 /* | |
4989 * Skip lines that are not in a paragraph. | |
4990 */ | |
4991 if (is_not_par) | |
4992 { | |
4993 if (line_count < 0) | |
4994 break; | |
4995 } | |
4996 else | |
4997 { | |
4998 /* | |
4999 * For the first line of a paragraph, check indent of second line. | |
5000 * Don't do this for comments and empty lines. | |
5001 */ | |
5002 if (first_par_line | |
5003 && (do_second_indent || do_number_indent) | |
5004 && prev_is_end_par | |
3584 | 5005 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5006 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5007 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5008 { |
5009 #ifdef FEAT_COMMENTS | |
5010 if (leader_len == 0 && next_leader_len == 0) | |
5011 { | |
5012 /* no comment found */ | |
5013 #endif | |
5014 second_indent = | |
5015 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5016 #ifdef FEAT_COMMENTS |
3584 | 5017 } |
5018 else | |
5019 { | |
5020 second_indent = next_leader_len; | |
5021 do_comments_list = 1; | |
5022 } | |
5023 #endif | |
5024 } | |
7 | 5025 else if (do_number_indent) |
3584 | 5026 { |
5027 #ifdef FEAT_COMMENTS | |
5028 if (leader_len == 0 && next_leader_len == 0) | |
5029 { | |
5030 /* no comment found */ | |
5031 #endif | |
5032 second_indent = | |
5033 get_number_indent(curwin->w_cursor.lnum); | |
5034 #ifdef FEAT_COMMENTS | |
5035 } | |
5036 else | |
5037 { | |
5038 /* get_number_indent() is now "comment aware"... */ | |
5039 second_indent = | |
5040 get_number_indent(curwin->w_cursor.lnum); | |
5041 do_comments_list = 1; | |
5042 } | |
5043 #endif | |
5044 } | |
7 | 5045 } |
5046 | |
5047 /* | |
5048 * When the comment leader changes, it's the end of the paragraph. | |
5049 */ | |
5050 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5051 #ifdef FEAT_COMMENTS | |
5052 || !same_leader(curwin->w_cursor.lnum, | |
5053 leader_len, leader_flags, | |
5054 next_leader_len, next_leader_flags) | |
5055 #endif | |
5056 ) | |
5057 is_end_par = TRUE; | |
5058 | |
5059 /* | |
5060 * If we have got to the end of a paragraph, or the line is | |
5061 * getting long, format it. | |
5062 */ | |
5063 if (is_end_par || force_format) | |
5064 { | |
5065 if (need_set_indent) | |
5066 /* replace indent in first line with minimal number of | |
5067 * tabs and spaces, according to current options */ | |
5068 (void)set_indent(get_indent(), SIN_CHANGED); | |
5069 | |
5070 /* put cursor on last non-space */ | |
5071 State = NORMAL; /* don't go past end-of-line */ | |
5072 coladvance((colnr_T)MAXCOL); | |
5073 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5074 dec_cursor(); | |
5075 | |
5076 /* do the formatting, without 'showmode' */ | |
5077 State = INSERT; /* for open_line() */ | |
5078 smd_save = p_smd; | |
5079 p_smd = FALSE; | |
5080 insertchar(NUL, INSCHAR_FORMAT | |
5081 #ifdef FEAT_COMMENTS | |
5082 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5083 + (do_comments && do_comments_list |
5084 ? INSCHAR_COM_LIST : 0) | |
7 | 5085 #endif |
1563 | 5086 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5087 State = old_State; |
5088 p_smd = smd_save; | |
5089 second_indent = -1; | |
5090 /* at end of par.: need to set indent of next par. */ | |
5091 need_set_indent = is_end_par; | |
5092 if (is_end_par) | |
5093 { | |
5094 /* When called with a negative line count, break at the | |
5095 * end of the paragraph. */ | |
5096 if (line_count < 0) | |
5097 break; | |
5098 first_par_line = TRUE; | |
5099 } | |
5100 force_format = FALSE; | |
5101 } | |
5102 | |
5103 /* | |
5104 * When still in same paragraph, join the lines together. But | |
5403 | 5105 * first delete the leader from the second line. |
7 | 5106 */ |
5107 if (!is_end_par) | |
5108 { | |
5109 advance = FALSE; | |
5110 curwin->w_cursor.lnum++; | |
5111 curwin->w_cursor.col = 0; | |
5112 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
|
5113 break; |
7 | 5114 #ifdef FEAT_COMMENTS |
5115 if (next_leader_len > 0) | |
5403 | 5116 { |
5117 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5118 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
|
5119 (long)-next_leader_len, 0); |
5403 | 5120 } else |
5121 #endif | |
5122 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5123 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5124 int indent = getwhitecols_curline(); |
5403 | 5125 |
5126 if (indent > 0) | |
5127 { | |
5128 (void)del_bytes(indent, FALSE, FALSE); | |
5129 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
|
5130 (colnr_T)0, 0L, (long)-indent, 0); |
5415 | 5131 } |
5403 | 5132 } |
7 | 5133 curwin->w_cursor.lnum--; |
5848 | 5134 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5135 { |
5136 beep_flush(); | |
5137 break; | |
5138 } | |
5139 first_par_line = FALSE; | |
5140 /* If the line is getting long, format it next time */ | |
5141 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5142 force_format = TRUE; | |
5143 else | |
5144 force_format = FALSE; | |
5145 } | |
5146 } | |
5147 line_breakcheck(); | |
5148 } | |
5149 } | |
5150 | |
5151 /* | |
5152 * Return TRUE if line "lnum" ends in a white character. | |
5153 */ | |
5154 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5155 ends_in_white(linenr_T lnum) |
7 | 5156 { |
5157 char_u *s = ml_get(lnum); | |
5158 size_t l; | |
5159 | |
5160 if (*s == NUL) | |
5161 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5162 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5163 * invocation may call function multiple times". */ |
5164 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
|
5165 return VIM_ISWHITE(s[l]); |
7 | 5166 } |
5167 | |
5168 /* | |
5169 * Blank lines, and lines containing only the comment leader, are left | |
5170 * untouched by the formatting. The function returns TRUE in this | |
5171 * case. It also returns TRUE when a line starts with the end of a comment | |
5172 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5173 * previous line. A new paragraph starts after a blank line, or when the | |
5174 * comment leader changes -- webb. | |
5175 */ | |
5176 #ifdef FEAT_COMMENTS | |
5177 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5178 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5179 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5180 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5181 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5182 int do_comments) |
7 | 5183 { |
5184 char_u *flags = NULL; /* init for GCC */ | |
5185 char_u *ptr; | |
5186 | |
5187 ptr = ml_get(lnum); | |
5188 if (do_comments) | |
3562 | 5189 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5190 else |
5191 *leader_len = 0; | |
5192 | |
5193 if (*leader_len > 0) | |
5194 { | |
5195 /* | |
5196 * Search for 'e' flag in comment leader flags. | |
5197 */ | |
5198 flags = *leader_flags; | |
5199 while (*flags && *flags != ':' && *flags != COM_END) | |
5200 ++flags; | |
5201 } | |
5202 | |
5203 return (*skipwhite(ptr + *leader_len) == NUL | |
5204 || (*leader_len > 0 && *flags == COM_END) | |
5205 || startPS(lnum, NUL, FALSE)); | |
5206 } | |
5207 #else | |
5208 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5209 fmt_check_par(linenr_T lnum) |
7 | 5210 { |
5211 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5212 } | |
5213 #endif | |
5214 | |
5215 /* | |
5216 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5217 * previous line is in the same paragraph. Used for auto-formatting. | |
5218 */ | |
5219 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5220 paragraph_start(linenr_T lnum) |
7 | 5221 { |
5222 char_u *p; | |
5223 #ifdef FEAT_COMMENTS | |
5224 int leader_len = 0; /* leader len of current line */ | |
5225 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5226 int next_leader_len; /* leader len of next line */ | |
5227 char_u *next_leader_flags; /* flags for leader of next line */ | |
5228 int do_comments; /* format comments */ | |
5229 #endif | |
5230 | |
5231 if (lnum <= 1) | |
5232 return TRUE; /* start of the file */ | |
5233 | |
5234 p = ml_get(lnum - 1); | |
5235 if (*p == NUL) | |
5236 return TRUE; /* after empty line */ | |
5237 | |
5238 #ifdef FEAT_COMMENTS | |
5239 do_comments = has_format_option(FO_Q_COMS); | |
5240 #endif | |
5241 if (fmt_check_par(lnum - 1 | |
5242 #ifdef FEAT_COMMENTS | |
5243 , &leader_len, &leader_flags, do_comments | |
5244 #endif | |
5245 )) | |
5246 return TRUE; /* after non-paragraph line */ | |
5247 | |
5248 if (fmt_check_par(lnum | |
5249 #ifdef FEAT_COMMENTS | |
5250 , &next_leader_len, &next_leader_flags, do_comments | |
5251 #endif | |
5252 )) | |
5253 return TRUE; /* "lnum" is not a paragraph line */ | |
5254 | |
5255 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5256 return TRUE; /* missing trailing space in previous line. */ | |
5257 | |
5258 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5259 return TRUE; /* numbered item starts in "lnum". */ | |
5260 | |
5261 #ifdef FEAT_COMMENTS | |
5262 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5263 next_leader_len, next_leader_flags)) | |
5264 return TRUE; /* change of comment leader. */ | |
5265 #endif | |
5266 | |
5267 return FALSE; | |
5268 } | |
5269 | |
5270 /* | |
5271 * prepare a few things for block mode yank/delete/tilde | |
5272 * | |
5273 * for delete: | |
5274 * - textlen includes the first/last char to be (partly) deleted | |
5275 * - start/endspaces is the number of columns that are taken by the | |
5276 * first/last deleted char minus the number of columns that have to be | |
1839 | 5277 * deleted. |
5278 * for yank and tilde: | |
7 | 5279 * - textlen includes the first/last char to be wholly yanked |
5280 * - start/endspaces is the number of columns of the first/last yanked char | |
5281 * that are to be yanked. | |
5282 */ | |
5283 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5284 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5285 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5286 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5287 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5288 int is_del) |
7 | 5289 { |
5290 int incr = 0; | |
5291 char_u *pend; | |
5292 char_u *pstart; | |
5293 char_u *line; | |
5294 char_u *prev_pstart; | |
5295 char_u *prev_pend; | |
5296 | |
5297 bdp->startspaces = 0; | |
5298 bdp->endspaces = 0; | |
5299 bdp->textlen = 0; | |
5300 bdp->start_vcol = 0; | |
5301 bdp->end_vcol = 0; | |
5302 bdp->is_short = FALSE; | |
5303 bdp->is_oneChar = FALSE; | |
5304 bdp->pre_whitesp = 0; | |
5305 bdp->pre_whitesp_c = 0; | |
5306 bdp->end_char_vcols = 0; | |
5307 bdp->start_char_vcols = 0; | |
5308 | |
5309 line = ml_get(lnum); | |
5310 pstart = line; | |
5311 prev_pstart = line; | |
5312 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5313 { | |
5314 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5315 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5316 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
|
5317 if (VIM_ISWHITE(*pstart)) |
7 | 5318 { |
5319 bdp->pre_whitesp += incr; | |
5320 bdp->pre_whitesp_c++; | |
5321 } | |
5322 else | |
5323 { | |
5324 bdp->pre_whitesp = 0; | |
5325 bdp->pre_whitesp_c = 0; | |
5326 } | |
5327 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5328 MB_PTR_ADV(pstart); |
7 | 5329 } |
5330 bdp->start_char_vcols = incr; | |
5331 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5332 { | |
5333 bdp->end_vcol = bdp->start_vcol; | |
5334 bdp->is_short = TRUE; | |
5335 if (!is_del || oap->op_type == OP_APPEND) | |
5336 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5337 } | |
5338 else | |
5339 { | |
5340 /* notice: this converts partly selected Multibyte characters to | |
5341 * spaces, too. */ | |
5342 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5343 if (is_del && bdp->startspaces) | |
5344 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5345 pend = pstart; | |
5346 bdp->end_vcol = bdp->start_vcol; | |
5347 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5348 { | |
5349 bdp->is_oneChar = TRUE; | |
5350 if (oap->op_type == OP_INSERT) | |
5351 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5352 else if (oap->op_type == OP_APPEND) | |
5353 { | |
5354 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5355 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5356 } | |
5357 else | |
5358 { | |
5359 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5360 if (is_del && oap->op_type != OP_LSHIFT) | |
5361 { | |
5362 /* just putting the sum of those two into | |
5363 * bdp->startspaces doesn't work for Visual replace, | |
5364 * so we have to split the tab in two */ | |
5365 bdp->startspaces = bdp->start_char_vcols | |
5366 - (bdp->start_vcol - oap->start_vcol); | |
5367 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5368 } | |
5369 } | |
5370 } | |
5371 else | |
5372 { | |
5373 prev_pend = pend; | |
5374 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5375 { | |
5376 /* Count a tab for what it's worth (if list mode not on) */ | |
5377 prev_pend = pend; | |
6535 | 5378 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5379 bdp->end_vcol += incr; |
5380 } | |
5381 if (bdp->end_vcol <= oap->end_vcol | |
5382 && (!is_del | |
5383 || oap->op_type == OP_APPEND | |
5384 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5385 { | |
5386 bdp->is_short = TRUE; | |
5387 /* Alternative: include spaces to fill up the block. | |
5388 * Disadvantage: can lead to trailing spaces when the line is | |
5389 * short where the text is put */ | |
5390 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5391 if (oap->op_type == OP_APPEND || virtual_op) | |
5392 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5393 + oap->inclusive; |
7 | 5394 else |
5395 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5396 } | |
5397 else if (bdp->end_vcol > oap->end_vcol) | |
5398 { | |
5399 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5400 if (!is_del && bdp->endspaces) | |
5401 { | |
5402 bdp->endspaces = incr - bdp->endspaces; | |
5403 if (pend != pstart) | |
5404 pend = prev_pend; | |
5405 } | |
5406 } | |
5407 } | |
5408 bdp->end_char_vcols = incr; | |
5409 if (is_del && bdp->startspaces) | |
5410 pstart = prev_pstart; | |
5411 bdp->textlen = (int)(pend - pstart); | |
5412 } | |
5413 bdp->textcol = (colnr_T) (pstart - line); | |
5414 bdp->textstart = pstart; | |
5415 } | |
5416 | |
5417 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5418 * Handle the add/subtract operator. |
7 | 5419 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5420 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5421 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5422 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5423 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
|
5424 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
|
5425 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5426 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5427 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5429 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5430 |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5431 // 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
|
5432 // 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
|
5433 // 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
|
5434 #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
|
5435 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
|
5436 #endif |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5437 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5439 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5440 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5441 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
|
5442 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5443 #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
|
5444 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
|
5445 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5447 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 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
|
5449 #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
|
5450 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
|
5451 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5452 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5453 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
|
5454 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5455 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5457 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5458 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5459 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 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
|
5462 (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
|
5463 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5464 #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
|
5465 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
|
5466 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5468 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5470 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5471 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
|
5472 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 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
|
5474 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 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
|
5476 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5479 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
|
5480 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5481 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5482 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5483 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
|
5484 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5485 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5486 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5487 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
|
5488 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5489 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
|
5490 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5491 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
|
5492 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5493 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5494 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5495 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5496 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5497 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5498 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
|
5499 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5500 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5501 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
|
5502 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5503 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5504 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
|
5505 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5506 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5507 /* 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
|
5508 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5509 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5510 ++change_cnt; |
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 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5513 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 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
|
5517 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 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
|
5519 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
|
5520 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 } |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5526 |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5527 #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
|
5528 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
|
5529 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5530 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5531 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
|
5532 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5534 /* 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
|
5535 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5536 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5537 /* 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
|
5538 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5539 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5540 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5541 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 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
|
5543 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
|
5544 change_cnt), change_cnt); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5546 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5547 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5549 * 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
|
5550 * 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
|
5551 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5552 * 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
|
5553 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5554 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5555 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5556 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5557 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5558 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5559 linenr_T Prenum1) |
7 | 5560 { |
5561 int col; | |
5562 char_u *buf1; | |
5563 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5564 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5565 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5566 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5567 uvarnumber_T oldn; |
7 | 5568 char_u *ptr; |
5569 int c; | |
5570 int todel; | |
5571 int dohex; | |
5572 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5573 int dobin; |
7 | 5574 int doalp; |
5575 int firstdigit; | |
5576 int subtract; | |
6868 | 5577 int negative = FALSE; |
6891 | 5578 int was_positive = TRUE; |
6868 | 5579 int visual = VIsual_active; |
6921 | 5580 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5581 pos_T save_cursor = curwin->w_cursor; |
6927 | 5582 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5583 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5584 pos_T endpos; |
7 | 5585 |
5586 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5587 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
|
5588 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5589 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5590 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5591 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5592 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5593 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5594 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5595 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5596 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5597 |
7 | 5598 /* |
5599 * First check if we are on a hexadecimal number, after the "0x". | |
5600 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5602 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5603 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5604 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
|
5605 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5606 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5607 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5608 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
|
5609 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5610 |
6868 | 5611 if (dohex) |
5612 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
|
5613 { |
6868 | 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 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5619 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5620 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5621 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5622 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5623 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5624 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5625 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5626 !(*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
|
5627 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5628 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5629 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5630 /* 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
|
5631 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5633 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5634 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
|
5635 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5636 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5637 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5638 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
|
5639 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5640 } |
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 if (( dohex |
6868 | 5643 && col > 0 |
5644 && (ptr[col] == 'X' | |
5645 || ptr[col] == 'x') | |
5646 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5647 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5648 !(*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
|
5649 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5650 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5651 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5652 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5653 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
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_isbdigit(ptr[col + 1]))) |
6868 | 5658 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5659 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5660 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5661 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5662 col -= (*mb_head_off)(ptr, ptr + col); |
6868 | 5663 } |
5664 else | |
7 | 5665 { |
6868 | 5666 /* |
5667 * Search forward and then backward to find the start of number. | |
5668 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 col = pos->col; |
6868 | 5670 |
5671 while (ptr[col] != NUL | |
5672 && !vim_isdigit(ptr[col]) | |
5673 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5674 col += MB_PTR2LEN(ptr + col); |
6868 | 5675 |
5676 while (col > 0 | |
5677 && vim_isdigit(ptr[col - 1]) | |
5678 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5679 { |
6868 | 5680 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5681 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5682 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
|
5683 } |
6868 | 5684 } |
5685 } | |
5686 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5693 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
|
5694 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5695 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5696 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5702 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
|
5703 && (!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
|
5704 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5711 * 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
|
5712 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 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
|
5715 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 goto theend; |
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 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5726 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 firstdigit = 'a'; |
6927 | 5731 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5742 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 firstdigit = 'z'; |
6927 | 5747 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5762 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5764 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5766 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5767 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5768 !(*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
|
5769 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5771 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5776 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5777 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
|
5778 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 + (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
|
5785 NULL, &n, maxlen, FALSE); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 /* 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
|
5788 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5803 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5805 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5807 if (!pre) |
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 if (subtract) |
6927 | 5810 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 if (n > oldn) |
6868 | 5812 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5813 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
|
5814 negative ^= TRUE; |
6868 | 5815 } |
7 | 5816 } |
5817 else | |
6868 | 5818 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 if (n < oldn) |
6868 | 5821 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5822 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 negative ^= TRUE; |
6868 | 5824 } |
6927 | 5825 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 if (n == 0) |
6868 | 5827 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 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
|
5831 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 |
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 * Delete the old number. |
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 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 * 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
|
5848 * 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
|
5849 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 if (c < 0x100 && isalpha(c)) |
6868 | 5855 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5857 hexupper = TRUE; |
6868 | 5858 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 hexupper = FALSE; |
6891 | 5860 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 /* 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
|
5862 (void)del_char(FALSE); |
6868 | 5863 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 * 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
|
5869 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16714
diff
changeset
|
5871 buf1 = alloc(length + NUMBUFLEN); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5875 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5896 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
|
5897 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 if ((n >> (bit - 1)) & 0x1) break; |
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 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 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
|
5904 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 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
|
5908 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
|
5909 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 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
|
5911 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
|
5912 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 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
|
5914 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
|
5915 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5916 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
|
5917 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
|
5918 (long_long_u_T)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5919 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 * 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
|
5923 * 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
|
5924 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 * 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
|
5926 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 while (length-- > 0) |
6868 | 5929 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 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
|
5933 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 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
|
5936 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5937 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5939 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5940 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5941 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5942 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5943 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5944 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
|
5945 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5946 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5947 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5948 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5949 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5950 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5951 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5952 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5953 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5954 return did_change; |
7 | 5955 } |
5956 | |
5957 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
5958 /* | |
5959 * SELECTION / PRIMARY ('*') | |
5960 * | |
5961 * Text selection stuff that uses the GUI selection register '*'. When using a | |
5962 * GUI this may be text from another window, otherwise it is the last text we | |
5963 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
5964 * button performs the paste, otherwise you will need to do <"*p>. " | |
5965 * If not under X, it is synonymous with the clipboard register '+'. | |
5966 * | |
5967 * X CLIPBOARD ('+') | |
5968 * | |
5969 * Text selection stuff that uses the GUI clipboard register '+'. | |
5970 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
5971 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
5972 * otherwise you will need to do <"+p>. " | |
5973 * If not under X, it is synonymous with the selection register '*'. | |
5974 */ | |
5975 | |
5976 /* | |
5977 * 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
|
5978 * so that the text is still available after Vim has exited. X selections |
7 | 5979 * only exist while the owning application exists, so we write to the |
5980 * permanent (while X runs) store CUT_BUFFER0. | |
5981 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
5982 * 'permanent' of the two), otherwise the PRIMARY one. | |
5983 * For now, use a hard-coded sanity limit of 1Mb of data. | |
5984 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
5985 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 5986 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5987 x11_export_final_selection(void) |
7 | 5988 { |
5989 Display *dpy; | |
5990 char_u *str = NULL; | |
5991 long_u len = 0; | |
5992 int motion_type = -1; | |
5993 | |
5994 # ifdef FEAT_GUI | |
5995 if (gui.in_use) | |
5996 dpy = X_DISPLAY; | |
5997 else | |
5998 # endif | |
5999 # ifdef FEAT_XCLIPBOARD | |
6000 dpy = xterm_dpy; | |
6001 # else | |
6002 return; | |
6003 # endif | |
6004 | |
6005 /* Get selection to export */ | |
6006 if (clip_plus.owned) | |
6007 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6008 else if (clip_star.owned) | |
6009 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6010 | |
6011 /* Check it's OK */ | |
6012 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6013 && len < 1024*1024 && len > 0) | |
6014 { | |
4201 | 6015 int ok = TRUE; |
6016 | |
1924 | 6017 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6018 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6019 * encoding conversion usually doesn't work, so keep the text as-is. | |
6020 */ | |
6021 if (has_mbyte) | |
6022 { | |
6023 vimconv_T vc; | |
6024 | |
6025 vc.vc_type = CONV_NONE; | |
6026 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6027 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6028 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6029 char_u *conv_str; |
2007 | 6030 |
4201 | 6031 vc.vc_fail = TRUE; |
2007 | 6032 conv_str = string_convert(&vc, str, &intlen); |
6033 len = intlen; | |
1924 | 6034 if (conv_str != NULL) |
6035 { | |
6036 vim_free(str); | |
6037 str = conv_str; | |
6038 } | |
4201 | 6039 else |
6040 { | |
6041 ok = FALSE; | |
6042 } | |
1924 | 6043 convert_setup(&vc, NULL, NULL); |
6044 } | |
4201 | 6045 else |
6046 { | |
6047 ok = FALSE; | |
6048 } | |
1924 | 6049 } |
4201 | 6050 |
6051 /* Do not store the string if conversion failed. Better to use any | |
6052 * other selection than garbled text. */ | |
6053 if (ok) | |
6054 { | |
6055 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6056 XFlush(dpy); | |
6057 } | |
7 | 6058 } |
6059 | |
6060 vim_free(str); | |
6061 } | |
6062 #endif | |
6063 | |
6064 void | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6065 clip_free_selection(Clipboard_T *cbd) |
7 | 6066 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6067 yankreg_T *y_ptr = y_current; |
7 | 6068 |
6069 if (cbd == &clip_plus) | |
6070 y_current = &y_regs[PLUS_REGISTER]; | |
6071 else | |
6072 y_current = &y_regs[STAR_REGISTER]; | |
6073 free_yank_all(); | |
6074 y_current->y_size = 0; | |
6075 y_current = y_ptr; | |
6076 } | |
6077 | |
6078 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
6079 * Get the selected text and put it in register '*' or '+'. |
7 | 6080 */ |
6081 void | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6082 clip_get_selection(Clipboard_T *cbd) |
7 | 6083 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 yankreg_T *old_y_previous, *old_y_current; |
7 | 6085 pos_T old_cursor; |
6086 pos_T old_visual; | |
6087 int old_visual_mode; | |
6088 colnr_T old_curswant; | |
6089 int old_set_curswant; | |
6090 pos_T old_op_start, old_op_end; | |
6091 oparg_T oa; | |
6092 cmdarg_T ca; | |
6093 | |
6094 if (cbd->owned) | |
6095 { | |
6096 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6097 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6098 return; | |
6099 | |
6100 /* Get the text between clip_star.start & clip_star.end */ | |
6101 old_y_previous = y_previous; | |
6102 old_y_current = y_current; | |
6103 old_cursor = curwin->w_cursor; | |
6104 old_curswant = curwin->w_curswant; | |
6105 old_set_curswant = curwin->w_set_curswant; | |
6106 old_op_start = curbuf->b_op_start; | |
6107 old_op_end = curbuf->b_op_end; | |
6108 old_visual = VIsual; | |
6109 old_visual_mode = VIsual_mode; | |
6110 clear_oparg(&oa); | |
6111 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6112 oa.op_type = OP_YANK; | |
6113 vim_memset(&ca, 0, sizeof(ca)); | |
6114 ca.oap = &oa; | |
6115 ca.cmdchar = 'y'; | |
6116 ca.count1 = 1; | |
6117 ca.retval = CA_NO_ADJ_OP_END; | |
6118 do_pending_operator(&ca, 0, TRUE); | |
6119 y_previous = old_y_previous; | |
6120 y_current = old_y_current; | |
6121 curwin->w_cursor = old_cursor; | |
688 | 6122 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6123 curwin->w_curswant = old_curswant; |
6124 curwin->w_set_curswant = old_set_curswant; | |
6125 curbuf->b_op_start = old_op_start; | |
6126 curbuf->b_op_end = old_op_end; | |
6127 VIsual = old_visual; | |
6128 VIsual_mode = old_visual_mode; | |
6129 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6130 else if (!is_clipboard_needs_update()) |
7 | 6131 { |
6132 clip_free_selection(cbd); | |
6133 | |
6134 /* Try to get selected text from another window */ | |
6135 clip_gen_request_selection(cbd); | |
6136 } | |
6137 } | |
6138 | |
2896 | 6139 /* |
6140 * Convert from the GUI selection string into the '*'/'+' register. | |
6141 */ | |
7 | 6142 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6143 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6144 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6145 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6146 long len, |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6147 Clipboard_T *cbd) |
7 | 6148 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 yankreg_T *y_ptr; |
7 | 6150 |
6151 if (cbd == &clip_plus) | |
6152 y_ptr = &y_regs[PLUS_REGISTER]; | |
6153 else | |
6154 y_ptr = &y_regs[STAR_REGISTER]; | |
6155 | |
6156 clip_free_selection(cbd); | |
6157 | |
5798 | 6158 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6159 } |
6160 | |
6161 /* | |
6162 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6163 * with length *len. | |
6164 * Returns the motion type, or -1 for failure. | |
6165 */ | |
6166 int | |
17063
3147c7c2e86b
patch 8.1.1531: clipboard type name is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
6167 clip_convert_selection(char_u **str, long_u *len, Clipboard_T *cbd) |
7 | 6168 { |
6169 char_u *p; | |
6170 int lnum; | |
6171 int i, j; | |
6172 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 yankreg_T *y_ptr; |
7 | 6174 |
6175 if (cbd == &clip_plus) | |
6176 y_ptr = &y_regs[PLUS_REGISTER]; | |
6177 else | |
6178 y_ptr = &y_regs[STAR_REGISTER]; | |
6179 | |
6180 #ifdef USE_CRNL | |
6181 eolsize = 2; | |
6182 #else | |
6183 eolsize = 1; | |
6184 #endif | |
6185 | |
6186 *str = NULL; | |
6187 *len = 0; | |
6188 if (y_ptr->y_array == NULL) | |
6189 return -1; | |
6190 | |
6191 for (i = 0; i < y_ptr->y_size; i++) | |
6192 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6193 | |
6194 /* | |
6195 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6196 */ | |
6197 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6198 *len -= eolsize; | |
6199 | |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6200 p = *str = alloc(*len + 1); // add one to avoid zero |
7 | 6201 if (p == NULL) |
6202 return -1; | |
6203 lnum = 0; | |
6204 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6205 { | |
6206 if (y_ptr->y_array[lnum][j] == '\n') | |
6207 p[i] = NUL; | |
6208 else if (y_ptr->y_array[lnum][j] == NUL) | |
6209 { | |
6210 #ifdef USE_CRNL | |
6211 p[i++] = '\r'; | |
6212 #endif | |
6213 p[i] = '\n'; | |
6214 lnum++; | |
6215 j = -1; | |
6216 } | |
6217 else | |
6218 p[i] = y_ptr->y_array[lnum][j]; | |
6219 } | |
6220 return y_ptr->y_type; | |
6221 } | |
6222 | |
6223 | |
6224 /* | |
6225 * If we have written to a clipboard register, send the text to the clipboard. | |
6226 */ | |
6227 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6228 may_set_selection(void) |
7 | 6229 { |
6230 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6231 { | |
6232 clip_own_selection(&clip_star); | |
6233 clip_gen_set_selection(&clip_star); | |
6234 } | |
6235 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6236 { | |
6237 clip_own_selection(&clip_plus); | |
6238 clip_gen_set_selection(&clip_plus); | |
6239 } | |
6240 } | |
6241 | |
6242 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6243 | |
6244 | |
6245 #if defined(FEAT_DND) || defined(PROTO) | |
6246 /* | |
6247 * Replace the contents of the '~' register with str. | |
6248 */ | |
6249 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6250 dnd_yank_drag_data(char_u *str, long len) |
7 | 6251 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6252 yankreg_T *curr; |
7 | 6253 |
6254 curr = y_current; | |
6255 y_current = &y_regs[TILDE_REGISTER]; | |
6256 free_yank_all(); | |
5798 | 6257 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6258 y_current = curr; |
6259 } | |
6260 #endif | |
6261 | |
6262 | |
6263 #if defined(FEAT_EVAL) || defined(PROTO) | |
6264 /* | |
6265 * Return the type of a register. | |
6266 * Used for getregtype() | |
6267 * Returns MAUTO for error. | |
6268 */ | |
6269 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6270 get_reg_type(int regname, long *reglen) |
7 | 6271 { |
6272 switch (regname) | |
6273 { | |
6274 case '%': /* file name */ | |
6275 case '#': /* alternate file name */ | |
6276 case '=': /* expression */ | |
6277 case ':': /* last command line */ | |
6278 case '/': /* last search-pattern */ | |
6279 case '.': /* last inserted text */ | |
6280 #ifdef FEAT_SEARCHPATH | |
6281 case Ctrl_F: /* Filename under cursor */ | |
6282 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6283 #endif | |
6284 case Ctrl_W: /* word under cursor */ | |
6285 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6286 case '_': /* black hole: always empty */ | |
6287 return MCHAR; | |
6288 } | |
6289 | |
6290 #ifdef FEAT_CLIPBOARD | |
6291 regname = may_get_selection(regname); | |
6292 #endif | |
6293 | |
5596 | 6294 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
|
6295 return MAUTO; |
5596 | 6296 |
7 | 6297 get_yank_register(regname, FALSE); |
6298 | |
6299 if (y_current->y_array != NULL) | |
6300 { | |
6301 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6302 *reglen = y_current->y_width; | |
6303 return y_current->y_type; | |
6304 } | |
6305 return MAUTO; | |
6306 } | |
6307 | |
5796 | 6308 /* |
6309 * When "flags" has GREG_LIST return a list with text "s". | |
6310 * Otherwise just return "s". | |
6311 */ | |
6312 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6313 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6314 { |
6315 if (flags & GREG_LIST) | |
6316 { | |
6317 list_T *list = list_alloc(); | |
6318 | |
6319 if (list != NULL) | |
6320 { | |
6321 if (list_append_string(list, NULL, -1) == FAIL) | |
6322 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6323 list_free(list); |
5796 | 6324 return NULL; |
6325 } | |
6326 list->lv_first->li_tv.vval.v_string = s; | |
6327 } | |
6328 return (char_u *)list; | |
6329 } | |
6330 return s; | |
6331 } | |
6332 | |
7 | 6333 /* |
6334 * Return the contents of a register as a single allocated string. | |
6335 * Used for "@r" in expressions and for getreg(). | |
6336 * Returns NULL for error. | |
5796 | 6337 * Flags: |
6338 * GREG_NO_EXPR Do not allow expression register | |
6339 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6340 * not the result of its evaluation. | |
6341 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6342 */ |
6343 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6344 get_reg_contents(int regname, int flags) |
7 | 6345 { |
6346 long i; | |
6347 char_u *retval; | |
6348 int allocated; | |
6349 long len; | |
6350 | |
6351 /* Don't allow using an expression register inside an expression */ | |
6352 if (regname == '=') | |
6353 { | |
5796 | 6354 if (flags & GREG_NO_EXPR) |
6355 return NULL; | |
6356 if (flags & GREG_EXPR_SRC) | |
6357 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6358 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6359 } |
6360 | |
6361 if (regname == '@') /* "@@" is used for unnamed register */ | |
6362 regname = '"'; | |
6363 | |
6364 /* check for valid regname */ | |
6365 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6366 return NULL; | |
6367 | |
6368 #ifdef FEAT_CLIPBOARD | |
6369 regname = may_get_selection(regname); | |
6370 #endif | |
6371 | |
6372 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6373 { | |
6374 if (retval == NULL) | |
6375 return NULL; | |
5796 | 6376 if (allocated) |
6377 return getreg_wrap_one_line(retval, flags); | |
6378 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6379 } |
6380 | |
6381 get_yank_register(regname, FALSE); | |
6382 if (y_current->y_array == NULL) | |
6383 return NULL; | |
6384 | |
5796 | 6385 if (flags & GREG_LIST) |
6386 { | |
6387 list_T *list = list_alloc(); | |
6388 int error = FALSE; | |
6389 | |
6390 if (list == NULL) | |
6391 return NULL; | |
6392 for (i = 0; i < y_current->y_size; ++i) | |
6393 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6394 error = TRUE; | |
6395 if (error) | |
6396 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6397 list_free(list); |
5796 | 6398 return NULL; |
6399 } | |
6400 return (char_u *)list; | |
6401 } | |
6402 | |
7 | 6403 /* |
6404 * Compute length of resulting string. | |
6405 */ | |
6406 len = 0; | |
6407 for (i = 0; i < y_current->y_size; ++i) | |
6408 { | |
6409 len += (long)STRLEN(y_current->y_array[i]); | |
6410 /* | |
6411 * Insert a newline between lines and after last line if | |
6412 * y_type is MLINE. | |
6413 */ | |
6414 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6415 ++len; | |
6416 } | |
6417 | |
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
6418 retval = alloc(len + 1); |
7 | 6419 |
6420 /* | |
6421 * Copy the lines of the yank register into the string. | |
6422 */ | |
6423 if (retval != NULL) | |
6424 { | |
6425 len = 0; | |
6426 for (i = 0; i < y_current->y_size; ++i) | |
6427 { | |
6428 STRCPY(retval + len, y_current->y_array[i]); | |
6429 len += (long)STRLEN(retval + len); | |
6430 | |
6431 /* | |
6432 * Insert a NL between lines and after the last line if y_type is | |
6433 * MLINE. | |
6434 */ | |
6435 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6436 retval[len++] = '\n'; | |
6437 } | |
6438 retval[len] = NUL; | |
6439 } | |
6440 | |
6441 return retval; | |
6442 } | |
6443 | |
5798 | 6444 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6445 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6446 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6447 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6448 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6449 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6450 int *yank_type UNUSED) |
5798 | 6451 { |
6452 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6453 { | |
6454 emsg_invreg(name); | |
6455 return FAIL; | |
6456 } | |
6457 | |
6458 /* Don't want to change the current (unnamed) register */ | |
6459 *old_y_previous = y_previous; | |
6460 *old_y_current = y_current; | |
6461 | |
6462 get_yank_register(name, TRUE); | |
6463 if (!y_append && !must_append) | |
6464 free_yank_all(); | |
6465 return OK; | |
6466 } | |
6467 | |
6468 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6469 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6470 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6471 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6472 yankreg_T *old_y_current) |
5798 | 6473 { |
6474 # ifdef FEAT_CLIPBOARD | |
6475 /* Send text of clipboard register to the clipboard. */ | |
6476 may_set_selection(); | |
6477 # endif | |
6478 | |
6479 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6480 if (name != '"') | |
6481 y_previous = old_y_previous; | |
6482 y_current = old_y_current; | |
6483 } | |
6484 | |
7 | 6485 /* |
6486 * Store string "str" in register "name". | |
6487 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6488 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6489 * if "name" is an uppercase letter. | |
6490 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6491 * Careful: 'str' is modified, you may have to use a copy! | |
6492 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6493 */ | |
6494 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6495 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6496 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6497 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6498 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6499 int must_append) |
7 | 6500 { |
6501 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6502 } | |
6503 | |
6504 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6505 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6506 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6507 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6508 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6509 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6510 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6511 long block_len) |
5798 | 6512 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6513 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6514 |
6515 if (name == '/' | |
6516 #ifdef FEAT_EVAL | |
6517 || name == '=' | |
6518 #endif | |
6519 ) | |
6520 { | |
6521 char_u *s; | |
6522 | |
6523 if (strings[0] == NULL) | |
6524 s = (char_u *)""; | |
6525 else if (strings[1] != NULL) | |
6526 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6527 emsg(_("E883: search pattern and expression register may not " |
5798 | 6528 "contain two or more lines")); |
6529 return; | |
6530 } | |
6531 else | |
6532 s = strings[0]; | |
6533 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6534 return; | |
6535 } | |
6536 | |
6537 if (name == '_') /* black hole: nothing to do */ | |
6538 return; | |
6539 | |
6540 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6541 &yank_type) == FAIL) | |
6542 return; | |
6543 | |
6544 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6545 | |
6546 finish_write_reg(name, old_y_previous, old_y_current); | |
6547 } | |
6548 | |
6549 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6550 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6551 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6552 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6553 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6554 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6555 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6556 long block_len) |
7 | 6557 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6558 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
|
6559 long len; |
7 | 6560 |
336 | 6561 if (maxlen >= 0) |
6562 len = maxlen; | |
6563 else | |
6564 len = (long)STRLEN(str); | |
6565 | |
7 | 6566 /* Special case: '/' search pattern */ |
6567 if (name == '/') | |
6568 { | |
6569 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
6570 return; | |
6571 } | |
6572 | |
6557 | 6573 if (name == '#') |
6574 { | |
6575 buf_T *buf; | |
6576 | |
6577 if (VIM_ISDIGIT(*str)) | |
6578 { | |
6579 int num = atoi((char *)str); | |
6580 | |
6581 buf = buflist_findnr(num); | |
6582 if (buf == NULL) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6583 semsg(_(e_nobufnr), (long)num); |
6557 | 6584 } |
6585 else | |
6586 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
6587 TRUE, FALSE, FALSE)); | |
6588 if (buf == NULL) | |
6589 return; | |
6590 curwin->w_alt_fnum = buf->b_fnum; | |
6591 return; | |
6592 } | |
6593 | |
336 | 6594 #ifdef FEAT_EVAL |
6595 if (name == '=') | |
6596 { | |
6597 char_u *p, *s; | |
6598 | |
6599 p = vim_strnsave(str, (int)len); | |
6600 if (p == NULL) | |
6601 return; | |
6602 if (must_append) | |
6603 { | |
6604 s = concat_str(get_expr_line_src(), p); | |
6605 vim_free(p); | |
6606 p = s; | |
6607 } | |
6608 set_expr_line(p); | |
6609 return; | |
6610 } | |
6611 #endif | |
6612 | |
7 | 6613 if (name == '_') /* black hole: nothing to do */ |
6614 return; | |
6615 | |
5798 | 6616 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
6617 &yank_type) == FAIL) | |
6618 return; | |
6619 | |
6620 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
6621 | |
6622 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 6623 } |
6624 #endif /* FEAT_EVAL */ | |
6625 | |
6626 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
6627 /* | |
6628 * Put a string into a register. When the register is not empty, the string | |
6629 * is appended. | |
6630 */ | |
6631 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6632 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6633 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
|
6634 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
|
6635 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
|
6636 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6637 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6638 int str_list) /* TRUE if str is char_u ** */ |
7 | 6639 { |
2896 | 6640 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 6641 int lnum; |
6642 long start; | |
6643 long i; | |
6644 int extra; | |
6645 int newlines; /* number of lines added */ | |
6646 int extraline = 0; /* extra line at the end */ | |
6647 int append = FALSE; /* append to last line in register */ | |
6648 char_u *s; | |
5798 | 6649 char_u **ss; |
7 | 6650 char_u **pp; |
6651 long maxlen; | |
6652 | |
2000 | 6653 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 6654 y_ptr->y_size = 0; |
6655 | |
2896 | 6656 if (yank_type == MAUTO) |
5798 | 6657 type = ((str_list || (len > 0 && (str[len - 1] == NL |
6658 || str[len - 1] == CAR))) | |
2896 | 6659 ? MLINE : MCHAR); |
6660 else | |
6661 type = yank_type; | |
6662 | |
7 | 6663 /* |
6664 * Count the number of lines within the string | |
6665 */ | |
6666 newlines = 0; | |
5798 | 6667 if (str_list) |
6668 { | |
6669 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 6670 ++newlines; |
5798 | 6671 } |
6672 else | |
6673 { | |
6674 for (i = 0; i < len; i++) | |
6675 if (str[i] == '\n') | |
6676 ++newlines; | |
6677 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
6678 { | |
6679 extraline = 1; | |
6680 ++newlines; /* count extra newline at the end */ | |
6681 } | |
6682 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
6683 { | |
6684 append = TRUE; | |
6685 --newlines; /* uncount newline when appending first line */ | |
6686 } | |
7 | 6687 } |
6688 | |
6807 | 6689 /* Without any lines make the register empty. */ |
6690 if (y_ptr->y_size + newlines == 0) | |
6691 { | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6692 VIM_CLEAR(y_ptr->y_array); |
6807 | 6693 return; |
6694 } | |
6695 | |
7 | 6696 /* |
6697 * Allocate an array to hold the pointers to the new register lines. | |
6698 * If the register was not empty, move the existing lines to the new array. | |
6699 */ | |
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
|
6700 pp = lalloc_clear((y_ptr->y_size + newlines) * sizeof(char_u *), TRUE); |
7 | 6701 if (pp == NULL) /* out of memory */ |
6702 return; | |
6703 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
6704 pp[lnum] = y_ptr->y_array[lnum]; | |
6705 vim_free(y_ptr->y_array); | |
6706 y_ptr->y_array = pp; | |
6707 maxlen = 0; | |
6708 | |
6709 /* | |
6710 * Find the end of each line and save it into the array. | |
6711 */ | |
5798 | 6712 if (str_list) |
6713 { | |
6714 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 6715 { |
5856 | 6716 i = (long)STRLEN(*ss); |
5798 | 6717 pp[lnum] = vim_strnsave(*ss, i); |
6718 if (i > maxlen) | |
6719 maxlen = i; | |
7 | 6720 } |
5798 | 6721 } |
6722 else | |
6723 { | |
6724 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 6725 { |
5798 | 6726 for (i = start; i < len; ++i) /* find the end of the line */ |
6727 if (str[i] == '\n') | |
6728 break; | |
6729 i -= start; /* i is now length of line */ | |
6730 if (i > maxlen) | |
6731 maxlen = i; | |
6732 if (append) | |
6733 { | |
6734 --lnum; | |
6735 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
6736 } | |
6737 else | |
6738 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
|
6739 s = alloc(i + extra + 1); |
5798 | 6740 if (s == NULL) |
6741 break; | |
6742 if (extra) | |
6743 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
6744 if (append) | |
6745 vim_free(y_ptr->y_array[lnum]); | |
6746 if (i) | |
6747 mch_memmove(s + extra, str + start, (size_t)i); | |
6748 extra += i; | |
6749 s[extra] = NUL; | |
6750 y_ptr->y_array[lnum++] = s; | |
6751 while (--extra >= 0) | |
6752 { | |
6753 if (*s == NUL) | |
6754 *s = '\n'; /* replace NUL with newline */ | |
6755 ++s; | |
6756 } | |
6757 append = FALSE; /* only first line is appended */ | |
7 | 6758 } |
6759 } | |
6760 y_ptr->y_type = type; | |
6761 y_ptr->y_size = lnum; | |
6762 if (type == MBLOCK) | |
6763 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
6764 else | |
6765 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6766 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6767 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
|
6768 #endif |
7 | 6769 } |
6770 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
6771 | |
6772 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6773 clear_oparg(oparg_T *oap) |
7 | 6774 { |
6775 vim_memset(oap, 0, sizeof(oparg_T)); | |
6776 } | |
6777 | |
6778 /* | |
161 | 6779 * Count the number of bytes, characters and "words" in a line. |
7 | 6780 * |
6781 * "Words" are counted by looking for boundaries between non-space and | |
6782 * space characters. (it seems to produce results that match 'wc'.) | |
6783 * | |
161 | 6784 * Return value is byte count; word count for the line is added to "*wc". |
6785 * Char count is added to "*cc". | |
7 | 6786 * |
6787 * The function will only examine the first "limit" characters in the | |
6788 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
6789 * case, eol_size will be added to the character count to account for | |
6790 * the size of the EOL character. | |
6791 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6792 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6793 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6794 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6795 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6796 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6797 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6798 int eol_size) |
7 | 6799 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6800 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6801 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6802 varnumber_T chars = 0; |
7 | 6803 int is_word = 0; |
6804 | |
3626 | 6805 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 6806 { |
6807 if (is_word) | |
6808 { | |
6809 if (vim_isspace(line[i])) | |
6810 { | |
6811 words++; | |
6812 is_word = 0; | |
6813 } | |
6814 } | |
6815 else if (!vim_isspace(line[i])) | |
6816 is_word = 1; | |
161 | 6817 ++chars; |
474 | 6818 i += (*mb_ptr2len)(line + i); |
7 | 6819 } |
6820 | |
6821 if (is_word) | |
6822 words++; | |
6823 *wc += words; | |
6824 | |
6825 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 6826 if (i < limit && line[i] == NUL) |
161 | 6827 { |
7 | 6828 i += eol_size; |
161 | 6829 chars += eol_size; |
6830 } | |
6831 *cc += chars; | |
7 | 6832 return i; |
6833 } | |
6834 | |
6835 /* | |
6836 * Give some info about the position of the cursor (for "g CTRL-G"). | |
6837 * In Visual mode, give some info about the selected region. (In this case, | |
6838 * 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
|
6839 * When "dict" is not NULL store the info there instead of showing it. |
7 | 6840 */ |
6841 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6842 cursor_pos_info(dict_T *dict) |
7 | 6843 { |
6844 char_u *p; | |
274 | 6845 char_u buf1[50]; |
6846 char_u buf2[40]; | |
7 | 6847 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6848 varnumber_T byte_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6849 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6850 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6851 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6852 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6853 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6854 varnumber_T word_count_cursor = 0; |
7 | 6855 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6856 varnumber_T last_check = 100000L; |
7 | 6857 long line_count_selected = 0; |
6858 pos_T min_pos, max_pos; | |
6859 oparg_T oparg; | |
6860 struct block_def bd; | |
6861 | |
6862 /* | |
6863 * Compute the length of the file in characters. | |
6864 */ | |
6865 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
6866 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6867 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6868 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
6869 msg(_(no_lines_msg)); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6870 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
6871 } |
7 | 6872 } |
6873 else | |
6874 { | |
6875 if (get_fileformat(curbuf) == EOL_DOS) | |
6876 eol_size = 2; | |
6877 else | |
6878 eol_size = 1; | |
6879 | |
6880 if (VIsual_active) | |
6881 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
6882 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 6883 { |
6884 min_pos = VIsual; | |
6885 max_pos = curwin->w_cursor; | |
6886 } | |
6887 else | |
6888 { | |
6889 min_pos = curwin->w_cursor; | |
6890 max_pos = VIsual; | |
6891 } | |
6892 if (*p_sel == 'e' && max_pos.col > 0) | |
6893 --max_pos.col; | |
6894 | |
6895 if (VIsual_mode == Ctrl_V) | |
6896 { | |
1866 | 6897 #ifdef FEAT_LINEBREAK |
6898 char_u * saved_sbr = p_sbr; | |
6899 | |
6900 /* Make 'sbr' empty for a moment to get the correct size. */ | |
6901 p_sbr = empty_option; | |
6902 #endif | |
7 | 6903 oparg.is_VIsual = 1; |
6904 oparg.block_mode = TRUE; | |
6905 oparg.op_type = OP_NOP; | |
6906 getvcols(curwin, &min_pos, &max_pos, | |
688 | 6907 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 6908 #ifdef FEAT_LINEBREAK |
6909 p_sbr = saved_sbr; | |
6910 #endif | |
688 | 6911 if (curwin->w_curswant == MAXCOL) |
6912 oparg.end_vcol = MAXCOL; | |
7 | 6913 /* Swap the start, end vcol if needed */ |
6914 if (oparg.end_vcol < oparg.start_vcol) | |
6915 { | |
6916 oparg.end_vcol += oparg.start_vcol; | |
6917 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
6918 oparg.end_vcol -= oparg.start_vcol; | |
6919 } | |
6920 } | |
6921 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
6922 } | |
6923 | |
6924 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
6925 { | |
6926 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 6927 if (byte_count > last_check) |
7 | 6928 { |
6929 ui_breakcheck(); | |
6930 if (got_int) | |
6931 return; | |
161 | 6932 last_check = byte_count + 100000L; |
7 | 6933 } |
6934 | |
6935 /* Do extra processing for VIsual mode. */ | |
6936 if (VIsual_active | |
6937 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
6938 { | |
45 | 6939 char_u *s = NULL; |
6940 long len = 0L; | |
6941 | |
7 | 6942 switch (VIsual_mode) |
6943 { | |
6944 case Ctrl_V: | |
6945 virtual_op = virtual_active(); | |
6946 block_prep(&oparg, &bd, lnum, 0); | |
6947 virtual_op = MAYBE; | |
45 | 6948 s = bd.textstart; |
6949 len = (long)bd.textlen; | |
7 | 6950 break; |
6951 case 'V': | |
45 | 6952 s = ml_get(lnum); |
6953 len = MAXCOL; | |
7 | 6954 break; |
6955 case 'v': | |
6956 { | |
6957 colnr_T start_col = (lnum == min_pos.lnum) | |
6958 ? min_pos.col : 0; | |
6959 colnr_T end_col = (lnum == max_pos.lnum) | |
6960 ? max_pos.col - start_col + 1 : MAXCOL; | |
6961 | |
45 | 6962 s = ml_get(lnum) + start_col; |
6963 len = end_col; | |
7 | 6964 } |
6965 break; | |
6966 } | |
45 | 6967 if (s != NULL) |
6968 { | |
161 | 6969 byte_count_cursor += line_count_info(s, &word_count_cursor, |
6970 &char_count_cursor, len, eol_size); | |
45 | 6971 if (lnum == curbuf->b_ml.ml_line_count |
6972 && !curbuf->b_p_eol | |
6933 | 6973 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 6974 && (long)STRLEN(s) < len) |
161 | 6975 byte_count_cursor -= eol_size; |
45 | 6976 } |
7 | 6977 } |
6978 else | |
6979 { | |
6980 /* In non-visual mode, check for the line the cursor is on */ | |
6981 if (lnum == curwin->w_cursor.lnum) | |
6982 { | |
6983 word_count_cursor += word_count; | |
161 | 6984 char_count_cursor += char_count; |
6985 byte_count_cursor = byte_count + | |
6986 line_count_info(ml_get(lnum), | |
6987 &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
|
6988 (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
|
6989 eol_size); |
7 | 6990 } |
6991 } | |
6992 /* Add to the running totals */ | |
161 | 6993 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
|
6994 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6995 eol_size); |
7 | 6996 } |
6997 | |
6998 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 6999 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7000 byte_count -= eol_size; |
7 | 7001 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7002 if (dict == NULL) |
7 | 7003 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7004 if (VIsual_active) |
7 | 7005 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7006 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
|
7007 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7008 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
|
7009 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7010 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
|
7011 (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
|
7012 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7013 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7014 buf1[0] = NUL; |
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 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
|
7017 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7018 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7019 _("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
|
7020 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7021 (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
|
7022 (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
|
7023 (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
|
7024 (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
|
7025 (long_long_T)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7026 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7027 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7028 _("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
|
7029 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7030 (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
|
7031 (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
|
7032 (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
|
7033 (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
|
7034 (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
|
7035 (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
|
7036 (long_long_T)byte_count); |
7 | 7037 } |
7038 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7039 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7040 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7041 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7042 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
|
7043 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7044 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
|
7045 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7046 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7047 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
|
7048 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7049 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7050 _("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
|
7051 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7052 (long)curwin->w_cursor.lnum, |
7 | 7053 (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
|
7054 (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
|
7055 (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
|
7056 else |
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; 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
|
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, |
161 | 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)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
|
7064 (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
|
7065 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7066 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7067 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7068 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7069 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7070 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
|
7071 _("(+%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
|
7072 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7073 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7074 /* 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
|
7075 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7076 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
|
7077 msg((char *)IObuff); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7078 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7079 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7080 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7081 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7082 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7083 { |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7084 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
|
7085 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
|
7086 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
|
7087 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
|
7088 byte_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7089 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
|
7090 char_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7091 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
|
7092 word_count_cursor); |
7 | 7093 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7094 #endif |
7 | 7095 } |