annotate src/ops.c @ 22196:d835f2fdfcfc v8.2.1647

patch 8.2.1647: Vim9: result of expression with && and || is not a bool Commit: https://github.com/vim/vim/commit/4ed124cc6c0c55385c3b2fed9f9357baf42edbcc Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 9 20:03:46 2020 +0200 patch 8.2.1647: Vim9: result of expression with && and || is not a bool Problem: Vim9: result of expression with && and || cannot be assigned to a bool variable. Solution: Add the TTFLAG_BOOL_OK flag and convert the value if needed.
author Bram Moolenaar <Bram@vim.org>
date Wed, 09 Sep 2020 20:15:03 +0200
parents 9064044fd4f6
children 0416105e103b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 * op_change, op_yank, do_put, do_join
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7576
diff changeset
17 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
18 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
19 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20
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
21 // 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
22 #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
23 #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
24
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 * The names of operators.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 * 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
28 * The third field holds OPF_ flags.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 static char opchars[][3] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 {
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
32 {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
33 {'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
34 {'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
35 {'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
36 {'<', 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
37 {'>', 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
38 {'!', 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
39 {'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
40 {'=', 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
41 {'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
42 {':', 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
43 {'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
44 {'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
45 {'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
46 {'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
47 {'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
48 {'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
49 {'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
50 {'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
51 {'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
52 {'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
53 {'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
54 {'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
55 {'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
56 {'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
57 {'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
58 {'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
59 {'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
60 {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
61 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65 * Translate a command name into an operator type.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
66 * Must only be called with a valid operator name!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
67 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
69 get_op_type(int char1, int char2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
70 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
71 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
72
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
73 if (char1 == 'r') // ignore second character
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
74 return OP_REPLACE;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
75 if (char1 == '~') // when tilde is an operator
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
76 return OP_TILDE;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
77 if (char1 == 'g' && char2 == Ctrl_A) // add
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
78 return OP_NR_ADD;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
79 if (char1 == 'g' && char2 == Ctrl_X) // subtract
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
80 return OP_NR_SUB;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81 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
82 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83 if (opchars[i][0] == char1 && opchars[i][1] == char2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
84 break;
13072
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents: 13047
diff changeset
85 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
86 {
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents: 13047
diff changeset
87 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
88 break;
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents: 13047
diff changeset
89 }
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents: 13047
diff changeset
90 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
91 return i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 * Return TRUE if operator "op" always works on whole lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 */
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
97 static int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
98 op_on_lines(int op)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99 {
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
100 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
101 }
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
15555
d89c5b339c2a patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents: 15543
diff changeset
103 #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
104 /*
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 * 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
106 */
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 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
108 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
109 {
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 return opchars[op][2] & OPF_CHANGE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111 }
15555
d89c5b339c2a patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents: 15543
diff changeset
112 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115 * Get first operator command character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 * Returns 'g' or 'z' if there is another command character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
117 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
118 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
119 get_op_char(int optype)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 return opchars[optype][0];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125 * Get second operator command character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
128 get_extra_op_char(int optype)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 return opchars[optype][1];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
131 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
133 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 * op_shift - handle a shift operation
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
136 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
137 op_shift(oparg_T *oap, int curs_top, int amount)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
139 long i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
140 int first_char;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
141 int block_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
142
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
145 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 block_col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
149
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
150 for (i = oap->line_count; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
151 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
152 first_char = *ml_get_curline();
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
153 if (first_char == NUL) // empty line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
155 else if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
156 shift_block(oap, amount);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157 else
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
158 // Move the line right if it doesn't start with '#', 'smartindent'
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
159 // isn't set or 'cindent' isn't set or '#' isn't in 'cino'.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
160 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
161 if (first_char != '#' || !preprocs_left())
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
162 #endif
1516
ee9d2d24ea9b updated for version 7.1-231
vimboss
parents: 1477
diff changeset
163 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
164 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
165 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
166
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
167 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
168 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
169 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
170 curwin->w_cursor.lnum = oap->start.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
171 curwin->w_cursor.col = block_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
172 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
173 else if (curs_top) // put cursor on first line, for ">>"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 curwin->w_cursor.lnum = oap->start.lnum;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
176 beginline(BL_SOL | BL_FIX); // shift_line() may have set cursor.col
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
178 else
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
179 --curwin->w_cursor.lnum; // put cursor on last line, for ":>"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
180
10486
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents: 10104
diff changeset
181 #ifdef FEAT_FOLDING
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
182 // The cursor line is not in a closed fold
10486
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents: 10104
diff changeset
183 foldOpenCursor();
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents: 10104
diff changeset
184 #endif
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents: 10104
diff changeset
185
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents: 10104
diff changeset
186
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
187 if (oap->line_count > p_report)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
188 {
14585
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
189 char *op;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
190 char *msg_line_single;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
191 char *msg_line_plural;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
192
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
193 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
194 op = ">";
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
195 else
14585
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
196 op = "<";
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
197 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
198 "%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
199 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
200 "%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
201 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
202 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
203 oap->line_count, op, amount);
19665
b64343cbabc6 patch 8.2.0389: delayed redraw when shifting text from Insert mode
Bram Moolenaar <Bram@vim.org>
parents: 19477
diff changeset
204 msg_attr_keep((char *)IObuff, 0, TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
205 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
206
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
207 if (!cmdmod.lockmarks)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
208 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
209 // Set "'[" and "']" marks.
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
210 curbuf->b_op_start = oap->start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
211 curbuf->b_op_end.lnum = oap->end.lnum;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
212 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
213 if (curbuf->b_op_end.col > 0)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
214 --curbuf->b_op_end.col;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
215 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
216 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
217
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
218 /*
15422
b55b89692fd2 patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15326
diff changeset
219 * 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
220 * leaves cursor on first blank in the line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
221 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
222 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
223 shift_line(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
224 int left,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
225 int round,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
226 int amount,
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
227 int call_changed_bytes) // call changed_bytes()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
228 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
229 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
230 int i, j;
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
231 int sw_val = (int)get_sw_value_indent(curbuf);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
232
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
233 count = get_indent(); // get current indent
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
234
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
235 if (round) // round off indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
236 {
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
237 i = count / sw_val; // number of 'shiftwidth' rounded down
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
238 j = count % sw_val; // extra spaces
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
239 if (j && left) // first remove extra spaces
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240 --amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 if (left)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243 i -= amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
245 i = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
247 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
248 i += amount;
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
249 count = i * sw_val;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
250 }
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
251 else // original vi indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 if (left)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
254 {
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
255 count -= sw_val * amount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
256 if (count < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
257 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
258 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
259 else
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
260 count += sw_val * amount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
261 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
262
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18164
diff changeset
263 // Set new indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
264 if (State & VREPLACE_FLAG)
1516
ee9d2d24ea9b updated for version 7.1-231
vimboss
parents: 1477
diff changeset
265 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
266 else
1516
ee9d2d24ea9b updated for version 7.1-231
vimboss
parents: 1477
diff changeset
267 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
268 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
269
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
270 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
271 * Shift one line of the current block one shiftwidth right or left.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
272 * Leaves cursor on first character in block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
273 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
274 static void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
275 shift_block(oparg_T *oap, int amount)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
276 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
277 int left = (oap->op_type == OP_LSHIFT);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
278 int oldstate = State;
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
279 int total;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
280 char_u *newp, *oldp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
281 int oldcol = curwin->w_cursor.col;
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
282 int sw_val = (int)get_sw_value_indent(curbuf);
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
283 int ts_val = (int)curbuf->b_p_ts;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 int incr;
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
286 colnr_T ws_vcol;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
287 int i = 0, j = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
288 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
289 #ifdef FEAT_RIGHTLEFT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
290 int old_p_ri = p_ri;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
291
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
292 p_ri = 0; // don't want revins in indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
293 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
294
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
295 State = INSERT; // don't want REPLACE for State
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
296 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
297 if (bd.is_short)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
298 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
299
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
300 // total is number of screen columns to be inserted/removed
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
301 total = (int)((unsigned)amount * (unsigned)sw_val);
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
302 if ((total / sw_val) != amount)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
303 return; // multiplication overflow
11997
66b677c77467 patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents: 11688
diff changeset
304
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
305 oldp = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307 if (!left)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310 * 1. Get start vcol
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
311 * 2. Total ws vcols
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
312 * 3. Divvy into TABs & spp
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
313 * 4. Construct new string
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
314 */
19195
2ef19eed524a patch 8.2.0156: various typos in source files and tests
Bram Moolenaar <Bram@vim.org>
parents: 19176
diff changeset
315 total += bd.pre_whitesp; // all virtual WS up to & incl a split TAB
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
316 ws_vcol = bd.start_vcol - bd.pre_whitesp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
317 if (bd.startspaces)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
318 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
319 if (has_mbyte)
8399
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
320 {
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
321 if ((*mb_ptr2len)(bd.textstart) == 1)
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
322 ++bd.textstart;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
323 else
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
324 {
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
325 ws_vcol = 0;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
326 bd.startspaces = 0;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
327 }
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents: 7829
diff changeset
328 }
1995
92809ecb9a47 updated for version 7.2-292
vimboss
parents: 1982
diff changeset
329 else
92809ecb9a47 updated for version 7.2-292
vimboss
parents: 1982
diff changeset
330 ++bd.textstart;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331 }
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11127
diff changeset
332 for ( ; VIM_ISWHITE(*bd.textstart); )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
334 // TODO: is passing bd.textstart for start of the line OK?
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
335 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart,
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
336 (colnr_T)(bd.start_vcol));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 total += incr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 bd.start_vcol += incr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
340 // OK, now total=all the VWS reqd, and textstart points at the 1st
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
341 // 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
342 #ifdef FEAT_VARTABS
2ad722003b36 patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
343 if (!curbuf->b_p_et)
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
344 tabstop_fromto(ws_vcol, ws_vcol + total,
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
345 ts_val, curbuf->b_p_vts_array, &i, &j);
14175
2ad722003b36 patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
346 else
2ad722003b36 patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
347 j = total;
2ad722003b36 patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
348 #else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 if (!curbuf->b_p_et)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
350 i = ((ws_vcol % ts_val) + total) / ts_val; // number of tabs
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 if (i)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
352 j = ((ws_vcol % ts_val) + total) % ts_val; // number of spp
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 j = total;
14175
2ad722003b36 patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
355 #endif
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
356 // if we're splitting a TAB, allow for it
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 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
359 newp = alloc(bd.textcol + i + j + len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 mch_memmove(newp, oldp, (size_t)bd.textcol);
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
364 vim_memset(newp + bd.textcol, TAB, (size_t)i);
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
365 vim_memset(newp + bd.textcol + i, ' ', (size_t)j);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
366 // the end
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
369 else // left
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
371 colnr_T destination_col; // column to which text in block will
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
372 // be shifted
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
373 char_u *verbatim_copy_end; // end of the part of the line which is
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
374 // copied verbatim
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
375 colnr_T verbatim_copy_width;// the (displayed) width of this part
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
376 // of line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
377 unsigned fill; // nr of spaces that replace a TAB
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
378 unsigned new_line_len; // the length of the line after the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
379 // block shift
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
380 size_t block_space_width;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
381 size_t shift_amount;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
382 char_u *non_white = bd.textstart;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
383 colnr_T non_white_col;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
384
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
385 /*
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
386 * Firstly, let's find the first non-whitespace character that is
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
387 * displayed after the block's start column and the character's column
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
388 * number. Also, let's calculate the width of all the whitespace
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
389 * characters that are displayed in the block and precede the searched
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
390 * non-whitespace character.
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
391 */
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
392
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
393 // If "bd.startspaces" is set, "bd.textstart" points to the character,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
394 // the part of which is displayed at the block's beginning. Let's start
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
395 // searching from the next character.
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
396 if (bd.startspaces)
11127
506f5d8b7d8b patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
397 MB_PTR_ADV(non_white);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
398
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
399 // The character's column is in "bd.start_vcol".
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
400 non_white_col = bd.start_vcol;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
401
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11127
diff changeset
402 while (VIM_ISWHITE(*non_white))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403 {
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
404 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
405 non_white_col += incr;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 }
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
407
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
408 block_space_width = non_white_col - oap->start_vcol;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
409 // We will shift by "total" or "block_space_width", whichever is less.
1860
f765f9c139de updated for version 7.2-158
vimboss
parents: 1839
diff changeset
410 shift_amount = (block_space_width < (size_t)total
f765f9c139de updated for version 7.2-158
vimboss
parents: 1839
diff changeset
411 ? block_space_width : (size_t)total);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
412
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
413 // The column to which we will shift the text.
1860
f765f9c139de updated for version 7.2-158
vimboss
parents: 1839
diff changeset
414 destination_col = (colnr_T)(non_white_col - shift_amount);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
415
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
416 // Now let's find out how much of the beginning of the line we can
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
417 // reuse without modification.
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
418 verbatim_copy_end = bd.textstart;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
419 verbatim_copy_width = bd.start_vcol;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
420
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
421 // If "bd.startspaces" is set, "bd.textstart" points to the character
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
422 // preceding the block. We have to subtract its width to obtain its
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
423 // column number.
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
424 if (bd.startspaces)
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
425 verbatim_copy_width -= bd.start_char_vcols;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
426 while (verbatim_copy_width < destination_col)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 {
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
428 char_u *line = verbatim_copy_end;
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
429
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
430 // TODO: is passing verbatim_copy_end for start of the line OK?
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
431 incr = lbr_chartabsize(line, verbatim_copy_end,
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
432 verbatim_copy_width);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
433 if (verbatim_copy_width + incr > destination_col)
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
434 break;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
435 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
436 MB_PTR_ADV(verbatim_copy_end);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
439 // If "destination_col" is different from the width of the initial
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
440 // part of the line that will be copied, it means we encountered a tab
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
441 // character, which we will have to partly replace with spaces.
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
442 fill = destination_col - verbatim_copy_width;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
443
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
444 // The replacement line will consist of:
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
445 // - the beginning of the original line up to "verbatim_copy_end",
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
446 // - "fill" number of spaces,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
447 // - the rest of the line, pointed to by non_white.
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
448 new_line_len = (unsigned)(verbatim_copy_end - oldp)
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
449 + fill
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
450 + (unsigned)STRLEN(non_white) + 1;
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
451
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
452 newp = alloc(new_line_len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 return;
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
455 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp));
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
456 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill);
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
457 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
459 // replace the line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460 ml_replace(curwin->w_cursor.lnum, newp, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
462 State = oldstate;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 curwin->w_cursor.col = oldcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
464 #ifdef FEAT_RIGHTLEFT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 p_ri = old_p_ri;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
466 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
467 }
15422
b55b89692fd2 patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15326
diff changeset
468
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
469 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470 * Insert string "s" (b_insert ? before : after) block :AKelly
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
471 * Caller must prepare for undo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
472 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
473 static void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
474 block_insert(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
475 oparg_T *oap,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
476 char_u *s,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
477 int b_insert,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
478 struct block_def *bdp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 {
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
480 int ts_val;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
481 int count = 0; // extra spaces to replace a cut TAB
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
482 int spaces = 0; // non-zero if cutting a TAB
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
483 colnr_T offset; // pointer along new line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
484 unsigned s_len; // STRLEN(s)
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
485 char_u *newp, *oldp; // new, old lines
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
486 linenr_T lnum; // loop var
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 int oldstate = State;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
489 State = INSERT; // don't want REPLACE for State
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 s_len = (unsigned)STRLEN(s);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
494 block_prep(oap, bdp, lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
495 if (bdp->is_short && b_insert)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
496 continue; // OP_INSERT, line ends before block start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
497
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
498 oldp = ml_get(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500 if (b_insert)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 {
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
502 ts_val = bdp->start_char_vcols;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 spaces = bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 if (spaces != 0)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
505 count = ts_val - 1; // we're cutting a TAB
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
506 offset = bdp->textcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
508 else // append
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
509 {
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
510 ts_val = bdp->end_char_vcols;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
511 if (!bdp->is_short) // spaces = padding after block
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 {
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
513 spaces = (bdp->endspaces ? ts_val - bdp->endspaces : 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 if (spaces != 0)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
515 count = ts_val - 1; // we're cutting a TAB
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 offset = bdp->textcol + bdp->textlen - (spaces != 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
518 else // spaces = padding to block edge
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
520 // if $ used, just append to EOL (ie spaces==0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
521 if (!bdp->is_MAX)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 spaces = (oap->end_vcol - bdp->end_vcol) + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 count = spaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 offset = bdp->textcol + bdp->textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
526 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
527
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
528 if (has_mbyte && spaces > 0)
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
529 {
6460
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
530 int off;
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
531
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
532 // Avoid starting halfway a multi-byte character.
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
533 if (b_insert)
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
534 {
6460
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
535 off = (*mb_head_off)(oldp, oldp + offset + spaces);
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
536 }
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
537 else
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
538 {
6460
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
539 off = (*mb_off_next)(oldp, oldp + offset);
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
540 offset += off;
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
541 }
6460
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
542 spaces -= off;
29f5cfca3388 updated for version 7.4.559
Bram Moolenaar <bram@vim.org>
parents: 6379
diff changeset
543 count -= off;
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
544 }
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6116
diff changeset
545
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
546 newp = alloc(STRLEN(oldp) + s_len + count + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
547 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
550 // copy up to shifted part
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551 mch_memmove(newp, oldp, (size_t)(offset));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 oldp += offset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
554 // insert pre-padding
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
555 vim_memset(newp + offset, ' ', (size_t)spaces);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
557 // copy the new text
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558 mch_memmove(newp + offset + spaces, s, (size_t)s_len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559 offset += s_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 if (spaces && !bdp->is_short)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
563 // insert post-padding
18100
df5778d73320 patch 8.1.2045: the option.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18062
diff changeset
564 vim_memset(newp + offset + spaces, ' ', (size_t)(ts_val - spaces));
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
565 // We're splitting a TAB, don't copy it.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566 oldp++;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
567 // We allowed for that TAB, remember this now
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 count++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 if (spaces > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
572 offset += count;
1622
149d8b46404c updated for version 7.2a
vimboss
parents: 1563
diff changeset
573 STRMOVE(newp + offset, oldp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575 ml_replace(lnum, newp, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
577 if (lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
579 // Set "']" mark to the end of the block instead of the end of
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
580 // the insert in the first line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 curbuf->b_op_end.lnum = oap->end.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 curbuf->b_op_end.col = offset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
584 } // for all lnum
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
585
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 State = oldstate;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
589 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
590
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
591 /*
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
592 * Handle a delete operation.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
593 *
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
594 * Return FAIL if undo failed, OK otherwise.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
597 op_delete(oparg_T *oap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
598 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
599 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
600 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
601 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 char_u *newp, *oldp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
603 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
604 linenr_T old_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
605 int did_yank = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
607 if (curbuf->b_ml.ml_flags & ML_EMPTY) // nothing to do
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
609
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
610 // Nothing to delete, return here. Do prepare undo, for op_change().
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
611 if (oap->empty)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612 return u_save_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 if (!curbuf->b_p_ma)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
615 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15428
diff changeset
616 emsg(_(e_modifiable));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
619
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620 #ifdef FEAT_CLIPBOARD
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
621 adjust_clip_reg(&oap->regname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
622 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625 mb_adjust_opend(oap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
627 /*
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
628 * 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
629 * 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
630 * 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
631 */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 if ( oap->motion_type == MCHAR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
633 && !oap->is_VIsual
50
90188be4861f updated for version 7.0028
vimboss
parents: 45
diff changeset
634 && !oap->block_mode
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635 && oap->line_count > 1
3254
2f075595590f updated for version 7.3.396
Bram Moolenaar <bram@vim.org>
parents: 3252
diff changeset
636 && oap->motion_force == NUL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 && oap->op_type == OP_DELETE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
638 {
2957
fe6ad3fd8532 updated for version 7.3.251
Bram Moolenaar <bram@vim.org>
parents: 2896
diff changeset
639 ptr = ml_get(oap->end.lnum) + oap->end.col;
fe6ad3fd8532 updated for version 7.3.251
Bram Moolenaar <bram@vim.org>
parents: 2896
diff changeset
640 if (*ptr != NUL)
fe6ad3fd8532 updated for version 7.3.251
Bram Moolenaar <bram@vim.org>
parents: 2896
diff changeset
641 ptr += oap->inclusive;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 ptr = skipwhite(ptr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
643 if (*ptr == NUL && inindent(0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
644 oap->motion_type = MLINE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
645 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
646
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
647 /*
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
648 * 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
649 * 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
650 */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 if ( oap->motion_type == MCHAR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 && oap->line_count == 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653 && oap->op_type == OP_DELETE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
654 && *ml_get(oap->start.lnum) == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
655 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 /*
446
7472c565592a updated for version 7.0117
vimboss
parents: 419
diff changeset
657 * It's an error to operate on an empty region, when 'E' included in
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
658 * 'cpoptions' (Vi compatible).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
659 */
446
7472c565592a updated for version 7.0117
vimboss
parents: 419
diff changeset
660 if (virtual_op)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
661 // Virtual editing: Nothing gets deleted, but we set the '[ and ']
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
662 // marks as if it happened.
446
7472c565592a updated for version 7.0117
vimboss
parents: 419
diff changeset
663 goto setmarks;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
665 beep_flush();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
666 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
667 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
669 /*
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
670 * 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
671 * 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
672 * 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
673 */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 if (oap->regname != '_')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
675 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
676 if (oap->regname != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
677 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
678 // check for read-only register
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
679 if (!valid_yank_reg(oap->regname, TRUE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
680 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
681 beep_flush();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
682 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
683 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
684 get_yank_register(oap->regname, TRUE); // yank into specif'd reg.
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
685 if (op_yank(oap, TRUE, FALSE) == OK) // yank without message
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
686 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
687 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
688
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
689 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
690 * 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
691 * 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
692 * compatible)
3782
063765c3cebb updated for version 7.3.649
Bram Moolenaar <bram@vim.org>
parents: 3740
diff changeset
693 * Use the register name from before adjust_clip_reg() may have
063765c3cebb updated for version 7.3.649
Bram Moolenaar <bram@vim.org>
parents: 3740
diff changeset
694 * changed it.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
695 */
15987
29de75f53b1a patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents: 15967
diff changeset
696 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
697 || oap->use_reg_one)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
698 {
10827
e366b968bf08 patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents: 10803
diff changeset
699 shift_delete_registers();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
700 if (op_yank(oap, TRUE, FALSE) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
701 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
703
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
704 // Yank into small delete register when no named register specified
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
705 // and the delete is within one line.
3468
b1a42d2522fb updated for version 7.3.498
Bram Moolenaar <bram@vim.org>
parents: 3421
diff changeset
706 if ((
b1a42d2522fb updated for version 7.3.498
Bram Moolenaar <bram@vim.org>
parents: 3421
diff changeset
707 #ifdef FEAT_CLIPBOARD
3584
443c50cd3e88 updated for version 7.3.552
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
708 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
443c50cd3e88 updated for version 7.3.552
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
709 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
3468
b1a42d2522fb updated for version 7.3.498
Bram Moolenaar <bram@vim.org>
parents: 3421
diff changeset
710 #endif
b1a42d2522fb updated for version 7.3.498
Bram Moolenaar <bram@vim.org>
parents: 3421
diff changeset
711 oap->regname == 0) && oap->motion_type != MLINE
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
712 && oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
713 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
714 oap->regname = '-';
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
715 get_yank_register(oap->regname, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
716 if (op_yank(oap, TRUE, FALSE) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
717 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
718 oap->regname = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
719 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
720
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
721 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
722 * If there's too much stuff to fit in the yank register, then get a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
723 * confirmation before doing the delete. This is crude, but simple.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
724 * And it avoids doing a delete of something we can't put back if we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
725 * want.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
726 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
727 if (!did_yank)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
728 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
729 int msg_silent_save = msg_silent;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
730
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
731 msg_silent = 0; // must display the prompt
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
732 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
733 msg_silent = msg_silent_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
734 if (n != 'y')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
735 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15428
diff changeset
736 emsg(_(e_abort));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
737 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
738 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
739 }
13037
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents: 12996
diff changeset
740
13380
69517d67421f patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents: 13254
diff changeset
741 #if defined(FEAT_EVAL)
13037
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents: 12996
diff changeset
742 if (did_yank && has_textyankpost())
18164
f57481564f2c patch 8.1.2077: the ops.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18100
diff changeset
743 yank_do_autocmd(oap, get_y_current());
13037
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents: 12996
diff changeset
744 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
746
2289
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
747 /*
3331756e4232 Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents: 2278
diff changeset
748 * 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
749 */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
750 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
751 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
752 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
753 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
754 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
755
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
756 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
757 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
758 block_prep(oap, &bd, lnum, TRUE);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
759 if (bd.textlen == 0) // nothing to delete
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
760 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
761
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
762 // Adjust cursor position for tab replaced by spaces and 'lbr'.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
763 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
764 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
765 curwin->w_cursor.col = bd.textcol + bd.startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
766 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
767 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
768
16682
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents: 16680
diff changeset
769 // "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
770 // 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
771 // Thus the number of characters may increase!
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
772 n = bd.textlen - bd.startspaces - bd.endspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
773 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
774 newp = alloc(STRLEN(oldp) + 1 - n);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
775 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
776 continue;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
777 // copy up to deleted part
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
778 mch_memmove(newp, oldp, (size_t)bd.textcol);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
779 // insert spaces
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
780 vim_memset(newp + bd.textcol, ' ',
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
781 (size_t)(bd.startspaces + bd.endspaces));
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
782 // copy the part after the deleted part
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
783 oldp += bd.textcol + bd.textlen;
1622
149d8b46404c updated for version 7.2a
vimboss
parents: 1563
diff changeset
784 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
785 // replace the line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786 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
787
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18619
diff changeset
788 #ifdef FEAT_PROP_POPUP
16682
7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete
Bram Moolenaar <Bram@vim.org>
parents: 16680
diff changeset
789 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
790 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
791 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
792 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
794 check_cursor_col();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796 oap->end.lnum + 1, 0L);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
797 oap->line_count = 0; // no lines deleted
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 }
5735
50dbef5e774a updated for version 7.4.212
Bram Moolenaar <bram@vim.org>
parents: 5730
diff changeset
799 else if (oap->motion_type == MLINE)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
800 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
801 if (oap->op_type == OP_CHANGE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
802 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
803 // Delete the lines except the first one. Temporarily move the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
804 // cursor to the next line. Save the current line number, if the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
805 // last line is deleted it may be changed.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
806 if (oap->line_count > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
807 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
808 lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
809 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
810 del_lines((long)(oap->line_count - 1), TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
812 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
813 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
814 return FAIL;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
815 if (curbuf->b_p_ai) // don't delete indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
817 beginline(BL_WHITE); // cursor on first non-white
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
818 did_ai = TRUE; // delete the indent when ESC hit
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
819 ai_col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
820 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
821 else
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
822 beginline(0); // cursor in column 0
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
823 truncate_line(FALSE); // delete the rest of the line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
824 // leave cursor past last char in line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
825 if (oap->line_count > 1)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
826 u_clearline(); // "U" command not possible after "2cc"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
827 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
828 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
829 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830 del_lines(oap->line_count, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 beginline(BL_WHITE | BL_FIX);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
832 u_clearline(); // "U" command not possible after "dd"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
834 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
835 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
836 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 if (virtual_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
838 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
839 int endcol = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
840
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
841 // For virtualedit: break the tabs that are partly included.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
842 if (gchar_pos(&oap->start) == '\t')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
843 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
844 if (u_save_cursor() == FAIL) // save first line for undo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
845 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
846 if (oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847 endcol = getviscol2(oap->end.col, oap->end.coladd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
848 coladvance_force(getviscol2(oap->start.col, oap->start.coladd));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 oap->start = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
850 if (oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 coladvance(endcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853 oap->end.col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 oap->end.coladd = curwin->w_cursor.coladd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
856 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
857 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
858
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
859 // Break a tab only when it's included in the area.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
860 if (gchar_pos(&oap->end) == '\t'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
861 && (int)oap->end.coladd < oap->inclusive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
862 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
863 // save last line for undo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
864 if (u_save((linenr_T)(oap->end.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
865 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
866 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
867 curwin->w_cursor = oap->end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
868 coladvance_force(getviscol2(oap->end.col, oap->end.coladd));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
869 oap->end = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
870 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871 }
18481
26256dcadd77 patch 8.1.2235: "C" with 'virtualedit' set does not include multi-byte char
Bram Moolenaar <Bram@vim.org>
parents: 18354
diff changeset
872 if (has_mbyte)
26256dcadd77 patch 8.1.2235: "C" with 'virtualedit' set does not include multi-byte char
Bram Moolenaar <Bram@vim.org>
parents: 18354
diff changeset
873 mb_adjust_opend(oap);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
874 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
875
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
876 if (oap->line_count == 1) // delete characters within one line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
877 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
878 if (u_save_cursor() == FAIL) // save line for undo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
879 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
880
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
881 // if 'cpoptions' contains '$', display '$' at end of change
5735
50dbef5e774a updated for version 7.4.212
Bram Moolenaar <bram@vim.org>
parents: 5730
diff changeset
882 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
883 && oap->op_type == OP_CHANGE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
884 && oap->end.lnum == curwin->w_cursor.lnum
5735
50dbef5e774a updated for version 7.4.212
Bram Moolenaar <bram@vim.org>
parents: 5730
diff changeset
885 && !oap->is_VIsual)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
886 display_dollar(oap->end.col - !oap->inclusive);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
887
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
888 n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
889
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 if (virtual_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
891 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
892 // fix up things for virtualedit-delete:
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
893 // break the tabs which are going to get in our way
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
894 char_u *curline = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
895 int len = (int)STRLEN(curline);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
896
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
897 if (oap->end.coladd != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 && (int)oap->end.col >= len - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899 && !(oap->start.coladd && (int)oap->end.col >= len - 1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 n++;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
901 // Delete at least one char (e.g, when on a control char).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 if (n == 0 && oap->start.coladd != oap->end.coladd)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
903 n = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
904
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
905 // When deleted a char in the line, reset coladd.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
906 if (gchar_cursor() != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
907 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
908 }
6826
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
909 (void)del_bytes((long)n, !virtual_op,
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
910 oap->op_type == OP_DELETE && !oap->is_VIsual);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
912 else // delete characters between lines
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914 pos_T curpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
916 // save deleted and changed lines for undo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
918 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
921 truncate_line(TRUE); // delete from cursor to end of line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
922
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
923 curpos = curwin->w_cursor; // remember curwin->w_cursor
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
925 del_lines((long)(oap->line_count - 2), FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
926
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
927 // delete from start of line until op_end
2957
fe6ad3fd8532 updated for version 7.3.251
Bram Moolenaar <bram@vim.org>
parents: 2896
diff changeset
928 n = (oap->end.col + 1 - !oap->inclusive);
6826
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
929 curwin->w_cursor.col = 0;
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
930 (void)del_bytes((long)n, !virtual_op,
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
931 oap->op_type == OP_DELETE && !oap->is_VIsual);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
932 curwin->w_cursor = curpos; // restore curwin->w_cursor
6826
bf3e6012dfbd patch 7.4.734
Bram Moolenaar <bram@vim.org>
parents: 6807
diff changeset
933 (void)do_join(2, FALSE, FALSE, FALSE, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
935 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
936
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
937 msgmore(curbuf->b_ml.ml_line_count - old_lcount);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
938
446
7472c565592a updated for version 7.0117
vimboss
parents: 419
diff changeset
939 setmarks:
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
940 if (!cmdmod.lockmarks)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 {
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
942 if (oap->block_mode)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
943 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
944 curbuf->b_op_end.lnum = oap->end.lnum;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
945 curbuf->b_op_end.col = oap->start.col;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
946 }
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
947 else
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
948 curbuf->b_op_end = oap->start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
949 curbuf->b_op_start = oap->start;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
950 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
951
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
955 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
956 * Adjust end of operating area for ending on a multi-byte character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957 * Used for deletion.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 static void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
960 mb_adjust_opend(oparg_T *oap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
961 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
963
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
964 if (oap->inclusive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 p = ml_get(oap->end.lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 oap->end.col += mb_tail_off(p, p + oap->end.col);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
969 }
15597
536dd2bc5ac9 patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15555
diff changeset
970
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
971 /*
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
972 * 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
973 * 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
974 */
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
975 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
976 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
977 {
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
978 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
979
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
980 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
981 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
982 State = n;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
983 // Backup to the replaced character.
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
984 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
985 }
15422
b55b89692fd2 patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15326
diff changeset
986
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
988 * Replace a whole area with one character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
989 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
990 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
991 op_replace(oparg_T *oap, int c)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 int n, numc;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994 int num_chars;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995 char_u *newp, *oldp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 size_t oldlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
997 struct block_def bd;
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
998 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
999 int had_ctrl_v_cr = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1000
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1001 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1002 return OK; // nothing to do
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1003
13202
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1004 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
1005 {
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1006 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
1007 c = CAR;
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1008 }
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1009 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
1010 {
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1011 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
1012 c = NL;
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents: 13072
diff changeset
1013 }
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1014
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 mb_adjust_opend(oap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1017
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1018 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1019 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1020 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1021
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1022 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023 * block mode replace
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1024 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1025 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1026 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1027 bd.is_MAX = (curwin->w_curswant == MAXCOL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1029 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1030 curwin->w_cursor.col = 0; // make sure cursor position is valid
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1031 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1032 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1033 continue; // nothing to replace
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1034
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1035 // n == number of extra chars required
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1036 // If we split a TAB, it may be replaced by several characters.
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1037 // Thus the number of characters may increase!
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1038 // If the range starts in virtual space, count the initial
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1039 // coladd offset as part of "startspaces"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1040 if (virtual_op && bd.is_short && *bd.textstart == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 pos_T vpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043
1982
b1b09b68d706 updated for version 7.2-279
vimboss
parents: 1969
diff changeset
1044 vpos.lnum = curwin->w_cursor.lnum;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1045 getvpos(&vpos, oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1046 bd.startspaces += vpos.coladd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1047 n = bd.startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1048 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1049 else
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1050 // allow for pre spaces
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1052
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1053 // allow for post spp
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1054 n += (bd.endspaces
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1055 && !bd.is_oneChar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1056 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1057 // Figure out how many characters to replace.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1058 numc = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1059 if (bd.is_short && (!virtual_op || bd.is_MAX))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1060 numc -= (oap->end_vcol - bd.end_vcol) + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1061
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1062 // A double-wide character can be replaced only up to half the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1063 // times.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1064 if ((*mb_char2cells)(c) > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1065 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1066 if ((numc & 1) && !bd.is_short)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1067 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1068 ++bd.endspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1069 ++n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1070 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1071 numc = numc / 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1072 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1073
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1074 // Compute bytes needed, move character count to num_chars.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1075 num_chars = numc;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1076 numc *= (*mb_char2len)(c);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1077 // oldlen includes textlen, so don't double count
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1078 n += numc - bd.textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1079
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1080 oldp = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081 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
1082 newp = alloc(oldlen + 1 + n);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1083 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1084 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1085 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n));
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1086 // copy up to deleted part
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087 mch_memmove(newp, oldp, (size_t)bd.textcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 oldp += bd.textcol + bd.textlen;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1089 // insert pre-spaces
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
1090 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1091 // insert replacement chars CHECK FOR ALLOCATED SPACE
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1092 // REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1093 // literally.
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1094 if (had_ctrl_v_cr || (c != '\r' && c != '\n'))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 {
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1096 if (has_mbyte)
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1097 {
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1098 n = (int)STRLEN(newp);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1099 while (--num_chars >= 0)
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1100 n += (*mb_char2bytes)(c, newp + n);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1101 }
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1102 else
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
1103 vim_memset(newp + STRLEN(newp), c, (size_t)numc);
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1104 if (!bd.is_short)
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1105 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1106 // insert post-spaces
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
1107 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1108 // copy the part after the changed part
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1109 STRMOVE(newp + STRLEN(newp), oldp);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1110 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1111 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1112 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1113 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1114 // 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
1115 after_p = alloc(oldlen + 1 + n - STRLEN(newp));
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1116 if (after_p != NULL)
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1117 STRMOVE(after_p, oldp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1118 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1119 // replace the line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1120 ml_replace(curwin->w_cursor.lnum, newp, FALSE);
5428
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1121 if (after_p != NULL)
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1122 {
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1123 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1124 appended_lines_mark(curwin->w_cursor.lnum, 1L);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1125 oap->end.lnum++;
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1126 vim_free(after_p);
d06223965468 updated for version 7.4.064
Bram Moolenaar <bram@vim.org>
parents: 5415
diff changeset
1127 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1128 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1129 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1130 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1131 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1132 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1133 * MCHAR and MLINE motion replace.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1134 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1135 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1136 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1137 oap->start.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1138 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1139 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1140 if (oap->end.col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1141 --oap->end.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1142 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1143 else if (!oap->inclusive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1144 dec(&(oap->end));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1145
11121
778c10516955 patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11065
diff changeset
1146 while (LTOREQ_POS(curwin->w_cursor, oap->end))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1147 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1148 n = gchar_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1149 if (n != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1150 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1151 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1152 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1153 // This is slow, but it handles replacing a single-byte
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1154 // with a multi-byte and the other way around.
4203
eea32254940f updated for version 7.3.853
Bram Moolenaar <bram@vim.org>
parents: 4201
diff changeset
1155 if (curwin->w_cursor.lnum == oap->end.lnum)
eea32254940f updated for version 7.3.853
Bram Moolenaar <bram@vim.org>
parents: 4201
diff changeset
1156 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
1157 replace_character(c);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161 if (n == TAB)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1162 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1163 int end_vcol = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1164
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1165 if (curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1166 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1167 // oap->end has to be recalculated when
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1168 // the tab breaks
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1169 end_vcol = getviscol2(oap->end.col,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1170 oap->end.coladd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1171 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1172 coladvance_force(getviscol());
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1173 if (curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1174 getvpos(&oap->end, end_vcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1175 }
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
1176 PBYTE(curwin->w_cursor, c);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1177 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1178 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1179 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1180 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1181 int virtcols = oap->end.coladd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1182
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1183 if (curwin->w_cursor.lnum == oap->start.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 && oap->start.col == oap->end.col && oap->start.coladd)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 virtcols -= oap->start.coladd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1187 // oap->end has been trimmed so it's effectively inclusive;
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1188 // as a result an extra +1 must be counted so we don't
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1189 // trample the NUL byte.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1190 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1191 curwin->w_cursor.col -= (virtcols + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1192 for (; virtcols >= 0; virtcols--)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1193 {
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
1194 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
1195 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
1196 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
1197 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
1198 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
1199 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1200 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1201 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1202
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1203 // Advance to next character, stop at the end of the file.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1204 if (inc_cursor() == -1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1205 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1206 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1207 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1208
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1209 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1210 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1211 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1212
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1213 if (!cmdmod.lockmarks)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1214 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1215 // Set "'[" and "']" marks.
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1216 curbuf->b_op_start = oap->start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1217 curbuf->b_op_end = oap->end;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1218 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1219
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1220 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1221 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7576
diff changeset
1223 static int swapchars(int op_type, pos_T *pos, int length);
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1224
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1226 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227 */
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
1228 static void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1229 op_tilde(oparg_T *oap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1230 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1231 pos_T pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1232 struct block_def bd;
1528
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1233 int did_change = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1234
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1235 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1236 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1237 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1238
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1239 pos = oap->start;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1240 if (oap->block_mode) // Visual block mode
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1241 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1242 for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1243 {
1766
bb4797166e4c updated for version 7.2-064
vimboss
parents: 1622
diff changeset
1244 int one_change;
bb4797166e4c updated for version 7.2-064
vimboss
parents: 1622
diff changeset
1245
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1246 block_prep(oap, &bd, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1247 pos.col = bd.textcol;
1766
bb4797166e4c updated for version 7.2-064
vimboss
parents: 1622
diff changeset
1248 one_change = swapchars(oap->op_type, &pos, bd.textlen);
bb4797166e4c updated for version 7.2-064
vimboss
parents: 1622
diff changeset
1249 did_change |= one_change;
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1250
5735
50dbef5e774a updated for version 7.4.212
Bram Moolenaar <bram@vim.org>
parents: 5730
diff changeset
1251 #ifdef FEAT_NETBEANS_INTG
2210
8c6a66e2b3cc Add :nbstart and :nbclose.
Bram Moolenaar <bram@vim.org>
parents: 2061
diff changeset
1252 if (netbeans_active() && one_change)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1253 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1254 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1255
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 22
diff changeset
1256 netbeans_removed(curbuf, pos.lnum, bd.textcol,
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 22
diff changeset
1257 (long)bd.textlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1258 netbeans_inserted(curbuf, pos.lnum, bd.textcol,
2210
8c6a66e2b3cc Add :nbstart and :nbclose.
Bram Moolenaar <bram@vim.org>
parents: 2061
diff changeset
1259 &ptr[bd.textcol], bd.textlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1260 }
5735
50dbef5e774a updated for version 7.4.212
Bram Moolenaar <bram@vim.org>
parents: 5730
diff changeset
1261 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1262 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1263 if (did_change)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1264 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1265 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1266 else // not block mode
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1269 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270 oap->start.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 pos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273 if (oap->end.col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 --oap->end.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1275 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276 else if (!oap->inclusive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 dec(&(oap->end));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278
1528
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1279 if (pos.lnum == oap->end.lnum)
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1280 did_change = swapchars(oap->op_type, &pos,
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1281 oap->end.col - pos.col + 1);
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1282 else
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1283 for (;;)
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1284 {
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1285 did_change |= swapchars(oap->op_type, &pos,
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1286 pos.lnum == oap->end.lnum ? oap->end.col + 1:
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1287 (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
1288 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1)
1528
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1289 break;
e212d1a40ca9 updated for version 7.1-243
vimboss
parents: 1525
diff changeset
1290 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 if (did_change)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1292 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1294 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1295 #ifdef FEAT_NETBEANS_INTG
2210
8c6a66e2b3cc Add :nbstart and :nbclose.
Bram Moolenaar <bram@vim.org>
parents: 2061
diff changeset
1296 if (netbeans_active() && did_change)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1299 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 pos = oap->start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302 while (pos.lnum < oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 777
diff changeset
1305 count = (int)STRLEN(ptr) - pos.col;
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 22
diff changeset
1306 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1307 netbeans_inserted(curbuf, pos.lnum, pos.col,
2210
8c6a66e2b3cc Add :nbstart and :nbclose.
Bram Moolenaar <bram@vim.org>
parents: 2061
diff changeset
1308 &ptr[pos.col], count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309 pos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 pos.lnum++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1311 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1312 ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1313 count = oap->end.col - pos.col + 1;
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 22
diff changeset
1314 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315 netbeans_inserted(curbuf, pos.lnum, pos.col,
2210
8c6a66e2b3cc Add :nbstart and :nbclose.
Bram Moolenaar <bram@vim.org>
parents: 2061
diff changeset
1316 &ptr[pos.col], count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1321
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322 if (!did_change && oap->is_VIsual)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1323 // No change: need to remove the Visual selection
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 redraw_curbuf_later(INVERTED);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1326 if (!cmdmod.lockmarks)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1327 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1328 // Set '[ and '] marks.
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1329 curbuf->b_op_start = oap->start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1330 curbuf->b_op_end = oap->end;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1331 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 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
1334 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
1335 oap->line_count), oap->line_count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 /*
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1339 * Invoke swapchar() on "length" bytes at position "pos".
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1340 * "pos" is advanced to just after the changed characters.
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1341 * "length" is rounded up to include the whole last multi-byte character.
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1342 * Also works correctly when the number of bytes changes.
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1343 * Returns TRUE if some character was changed.
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1344 */
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1345 static int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1346 swapchars(int op_type, pos_T *pos, int length)
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1347 {
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1348 int todo;
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1349 int did_change = 0;
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1350
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1351 for (todo = length; todo > 0; --todo)
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1352 {
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1353 if (has_mbyte)
5288
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1354 {
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1355 int len = (*mb_ptr2len)(ml_get_pos(pos));
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1356
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1357 // we're counting bytes, not characters
5288
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1358 if (len > 0)
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1359 todo -= len - 1;
46cf49cc9289 updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents: 5245
diff changeset
1360 }
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1361 did_change |= swapchar(op_type, pos);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1362 if (inc(pos) == -1) // at end of file
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1363 break;
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1364 }
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1365 return did_change;
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1366 }
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1367
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1368 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1369 * If op_type == OP_UPPER: make uppercase,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1370 * if op_type == OP_LOWER: make lowercase,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 * if op_type == OP_ROT13: do rot13 encoding,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372 * else swap case of character at 'pos'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 * returns TRUE when something actually changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1375 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1376 swapchar(int op_type, pos_T *pos)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 int c;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 int nc;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1380
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 c = gchar_pos(pos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1383 // Only do rot13 encoding for ASCII characters.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1384 if (c >= 0x80 && op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1385 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1386
1525
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1387 if (op_type == OP_UPPER && c == 0xdf
76985a406456 updated for version 7.1-240
vimboss
parents: 1516
diff changeset
1388 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0))
493
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1389 {
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1390 pos_T sp = curwin->w_cursor;
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1391
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1392 // Special handling of German sharp s: change to "SS".
493
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1393 curwin->w_cursor = *pos;
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1394 del_char(FALSE);
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1395 ins_char('S');
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1396 ins_char('S');
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1397 curwin->w_cursor = sp;
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1398 inc(pos);
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1399 }
06364aa0d597 updated for version 7.0135
vimboss
parents: 480
diff changeset
1400
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1401 if (enc_dbcs != 0 && c >= 0x100) // No lower/uppercase letter
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1402 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 nc = c;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 if (MB_ISLOWER(c))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1405 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406 if (op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407 nc = ROT13(c, 'a');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1408 else if (op_type != OP_LOWER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1409 nc = MB_TOUPPER(c);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1410 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1411 else if (MB_ISUPPER(c))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1412 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1413 if (op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1414 nc = ROT13(c, 'A');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1415 else if (op_type != OP_UPPER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1416 nc = MB_TOLOWER(c);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1417 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1418 if (nc != c)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1419 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1420 if (enc_utf8 && (c >= 0x80 || nc >= 0x80))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1421 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422 pos_T sp = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 curwin->w_cursor = *pos;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1425 // don't use del_char(), it also removes composing chars
2451
0b8612c2814d Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents: 2446
diff changeset
1426 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427 ins_char(nc);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1428 curwin->w_cursor = sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1430 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
1431 PBYTE(*pos, nc);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1432 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1433 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1434 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1435 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1436
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1438 * op_insert - Insert and append operators for Visual mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1441 op_insert(oparg_T *oap, long count1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443 long ins_len, pre_textlen = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 char_u *firstline, *ins_text;
12329
0b10cff73322 patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12327
diff changeset
1445 colnr_T ind_pre = 0, ind_post;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447 int i;
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1448 pos_T t1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1450 // edit() changes this - record it for OP_APPEND
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1451 bd.is_MAX = (curwin->w_curswant == MAXCOL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1453 // vis block is still marked. Get rid of it now.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 curwin->w_cursor.lnum = oap->start.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1455 update_screen(INVERTED);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1456
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1457 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1458 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1459 // When 'virtualedit' is used, need to insert the extra spaces before
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1460 // doing block_prep(). When only "block" is used, virtual edit is
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1461 // already disabled, but still need it when calling
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1462 // coladvance_force().
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1463 if (curwin->w_cursor.coladd > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1465 int old_ve_flags = ve_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1467 ve_flags = VE_ALL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1468 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1470 coladvance_force(oap->op_type == OP_APPEND
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1471 ? oap->end_vcol + 1 : getviscol());
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1472 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1473 --curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474 ve_flags = old_ve_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1476 // Get the info about the block before entering the text
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1477 block_prep(oap, &bd, oap->start.lnum, TRUE);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1478 // Get indent information
12323
4dba3e4f3b01 patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents: 11997
diff changeset
1479 ind_pre = (colnr_T)getwhitecols_curline();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480 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
1481
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 firstline += bd.textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 pre_textlen = (long)STRLEN(firstline);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1486
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488 {
15636
6f1c7e9a6393 patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15597
diff changeset
1489 if (oap->block_mode && curwin->w_cursor.coladd == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1491 // Move the cursor to the character right of the block.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1492 curwin->w_set_curswant = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1493 while (*ml_get_cursor() != NUL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 && (curwin->w_cursor.col < bd.textcol + bd.textlen))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495 ++curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 if (bd.is_short && !bd.is_MAX)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1498 // First line was too short, make it longer and adjust the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1499 // values in "bd".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1501 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 for (i = 0; i < bd.endspaces; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1503 ins_char(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1504 bd.textlen += bd.endspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1505 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1506 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1508 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 curwin->w_cursor = oap->end;
893
bf7803d0f5b9 updated for version 7.0-019
vimboss
parents: 856
diff changeset
1510 check_cursor_col();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1511
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1512 // 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
1513 if (!LINEEMPTY(curwin->w_cursor.lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 && oap->start_vcol != oap->end_vcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1515 inc_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1516 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1517 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1519 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
1520 (void)edit(NUL, FALSE, (linenr_T)count1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1521
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1522 // When a tab was inserted, and the characters in front of the tab
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1523 // have been converted to a tab as well, the column of the cursor
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1524 // might have actually been reduced, so need to adjust here.
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1525 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
1526 && LT_POS(curbuf->b_op_start_orig, t1))
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1527 oap->start = curbuf->b_op_start_orig;
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1528
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1529 // If user has moved off this line, we don't know what to do, so do
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1530 // nothing.
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1531 // Also don't repeat the insert when Insert mode ended with CTRL-C.
1477
2951f28a9bd3 updated for version 7.1-192
vimboss
parents: 1451
diff changeset
1532 if (curwin->w_cursor.lnum != oap->start.lnum || got_int)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1533 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1536 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1537 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
1538 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
1539 size_t len;
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents: 13620
diff changeset
1540 int add;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1542 // If indent kicked in, the firstline might have changed
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1543 // but only do that, if the indent actually increased.
12327
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1544 ind_post = (colnr_T)getwhitecols_curline();
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1545 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
1546 {
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1547 bd.textcol += ind_post - ind_pre;
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1548 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
1549 did_indent = TRUE;
12327
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1550 }
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 12323
diff changeset
1551
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1552 // The user may have moved the cursor before inserting something, try
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1553 // to adjust the block for that. But only do it, if the difference
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1554 // does not come from indent kicking in.
13620
4faf77b96432 patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents: 13614
diff changeset
1555 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
1556 && !bd.is_MAX && !did_indent)
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1557 {
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1558 if (oap->op_type == OP_INSERT
15636
6f1c7e9a6393 patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15597
diff changeset
1559 && oap->start.col + oap->start.coladd
5730
420fd9cb86d5 updated for version 7.4.210
Bram Moolenaar <bram@vim.org>
parents: 5680
diff changeset
1560 != curbuf->b_op_start_orig.col
15636
6f1c7e9a6393 patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15597
diff changeset
1561 + curbuf->b_op_start_orig.coladd)
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1562 {
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1563 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
1564 curbuf->b_op_start_orig.coladd);
5680
4d12112c5efa updated for version 7.4.186
Bram Moolenaar <bram@vim.org>
parents: 5664
diff changeset
1565 oap->start.col = curbuf->b_op_start_orig.col;
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1566 pre_textlen -= t - oap->start_vcol;
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1567 oap->start_vcol = t;
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1568 }
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1569 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
1570 && oap->end.col + oap->end.coladd
5730
420fd9cb86d5 updated for version 7.4.210
Bram Moolenaar <bram@vim.org>
parents: 5680
diff changeset
1571 >= curbuf->b_op_start_orig.col
15636
6f1c7e9a6393 patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15597
diff changeset
1572 + curbuf->b_op_start_orig.coladd)
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1573 {
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1574 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
1575 curbuf->b_op_start_orig.coladd);
5680
4d12112c5efa updated for version 7.4.186
Bram Moolenaar <bram@vim.org>
parents: 5664
diff changeset
1576 oap->start.col = curbuf->b_op_start_orig.col;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1577 // reset pre_textlen to the value of OP_INSERT
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1578 pre_textlen += bd.textlen;
6579
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1579 pre_textlen -= t - oap->start_vcol;
a287b0e9e87b updated for version 7.4.616
Bram Moolenaar <bram@vim.org>
parents: 6557
diff changeset
1580 oap->start_vcol = t;
5471
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1581 oap->op_type = OP_INSERT;
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1582 }
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1583 }
70c3289803b3 updated for version 7.4.085
Bram Moolenaar <bram@vim.org>
parents: 5438
diff changeset
1584
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586 * Spaces and tabs in the indent may have changed to other spaces and
1392
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1587 * tabs. Get the starting column again and correct the length.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 * Don't do this when "$" used, end-of-line will have changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1590 block_prep(oap, &bd2, oap->start.lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1591 if (!bd.is_MAX || bd2.textlen < bd.textlen)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 pre_textlen += bd2.textlen - bd.textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596 if (bd2.endspaces)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 --bd2.textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1599 bd.textcol = bd2.textcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 bd.textlen = bd2.textlen;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1603 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 * Subsequent calls to ml_get() flush the firstline data - take a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 * copy of the required string.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 */
13814
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents: 13620
diff changeset
1607 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
1608 len = STRLEN(firstline);
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents: 13620
diff changeset
1609 add = bd.textcol;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 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
1611 add += bd.textlen;
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents: 13620
diff changeset
1612 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
1613 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
1614 else
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents: 13620
diff changeset
1615 firstline += add;
3421
fb2c5a51dac7 updated for version 7.3.476
Bram Moolenaar <bram@vim.org>
parents: 3400
diff changeset
1616 if (pre_textlen >= 0
fb2c5a51dac7 updated for version 7.3.476
Bram Moolenaar <bram@vim.org>
parents: 3400
diff changeset
1617 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 {
20830
9064044fd4f6 patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents: 20822
diff changeset
1619 ins_text = vim_strnsave(firstline, ins_len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 if (ins_text != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1621 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1622 // block handled here
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 if (u_save(oap->start.lnum,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 (linenr_T)(oap->end.lnum + 1)) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 block_insert(oap, ins_text, (oap->op_type == OP_INSERT),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 &bd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628 curwin->w_cursor.col = oap->start.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630 vim_free(ins_text);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1637 * op_change - handle a change operation
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 * return TRUE if edit() returns because of a CTRL-O command
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1642 op_change(oparg_T *oap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1643 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 colnr_T l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645 int retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1646 long offset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1647 linenr_T linenr;
1392
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1648 long ins_len;
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1649 long pre_textlen = 0;
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1650 long pre_indent = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651 char_u *firstline;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 char_u *ins_text, *newp, *oldp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 l = oap->start.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 l = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659 #ifdef FEAT_SMARTINDENT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660 if (!p_paste && curbuf->b_p_si
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661 # ifdef FEAT_CINDENT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1662 && !curbuf->b_p_cin
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1663 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 )
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1665 can_si = TRUE; // It's like opening a new line, do si
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1669 // First delete the text in the region. In an empty buffer only need to
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1670 // save for undo
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1671 if (curbuf->b_ml.ml_flags & ML_EMPTY)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1672 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1673 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1675 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 else if (op_delete(oap) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1678
11121
778c10516955 patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11065
diff changeset
1679 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 && !virtual_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681 inc_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1682
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1683 // check for still on same line (<CR> in inserted text meaningless)
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1684 // skip blank lines too
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1685 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1687 // Add spaces before getting the current line length.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1688 if (virtual_op && (curwin->w_cursor.coladd > 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 || gchar_cursor() == NUL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 coladvance_force(getviscol());
1392
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1691 firstline = ml_get(oap->start.lnum);
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1692 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
1693 pre_indent = (long)getwhitecols(firstline);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 bd.textcol = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1696
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1697 #if defined(FEAT_LISP) || defined(FEAT_CINDENT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 fix_indent();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1702 retval = edit(NUL, FALSE, (linenr_T)1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1703
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1704 /*
39
410fa1a31baf updated for version 7.0023
vimboss
parents: 36
diff changeset
1705 * In Visual block mode, handle copying the new text to all lines of the
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1706 * block.
1477
2951f28a9bd3 updated for version 7.1-192
vimboss
parents: 1451
diff changeset
1707 * Don't repeat the insert when Insert mode ended with CTRL-C.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1708 */
1477
2951f28a9bd3 updated for version 7.1-192
vimboss
parents: 1451
diff changeset
1709 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1710 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1711 // Auto-indenting may have changed the indent. If the cursor was past
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1712 // the indent, exclude that indent change from the inserted text.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1713 firstline = ml_get(oap->start.lnum);
1403
871231399cf5 updated for version 7.1-118
vimboss
parents: 1392
diff changeset
1714 if (bd.textcol > (colnr_T)pre_indent)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1715 {
12323
4dba3e4f3b01 patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents: 11997
diff changeset
1716 long new_indent = (long)getwhitecols(firstline);
1392
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1717
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1718 pre_textlen += new_indent - pre_indent;
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1719 bd.textcol += new_indent - pre_indent;
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1720 }
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1721
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1722 ins_len = (long)STRLEN(firstline) - pre_textlen;
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1723 if (ins_len > 0)
27782797c331 updated for version 7.1-107
vimboss
parents: 1304
diff changeset
1724 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1725 // Subsequent calls to ml_get() flush the firstline data - take a
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1726 // 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
1727 if ((ins_text = alloc(ins_len + 1)) != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1728 {
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 356
diff changeset
1729 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1730 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1731 linenr++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1732 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1733 block_prep(oap, &bd, linenr, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1734 if (!bd.is_short || virtual_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1735 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1736 pos_T vpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1737
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1738 // If the block starts in virtual space, count the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1739 // initial coladd offset as part of "startspaces"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1740 if (bd.is_short)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1741 {
1982
b1b09b68d706 updated for version 7.2-279
vimboss
parents: 1969
diff changeset
1742 vpos.lnum = linenr;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1743 (void)getvpos(&vpos, oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1744 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1745 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1746 vpos.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1747 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
1748 newp = alloc(STRLEN(oldp) + vpos.coladd + ins_len + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1749 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1750 continue;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1751 // copy up to block start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1752 mch_memmove(newp, oldp, (size_t)bd.textcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1753 offset = bd.textcol;
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
1754 vim_memset(newp + offset, ' ', (size_t)vpos.coladd);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755 offset += vpos.coladd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756 mch_memmove(newp + offset, ins_text, (size_t)ins_len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1757 offset += ins_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1758 oldp += bd.textcol;
1622
149d8b46404c updated for version 7.2a
vimboss
parents: 1563
diff changeset
1759 STRMOVE(newp + offset, oldp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1760 ml_replace(linenr, newp, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1761 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1763 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1764
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1765 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1766 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1767 vim_free(ins_text);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1768 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1769 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1772 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 /*
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1775 * When the cursor is on the NUL past the end of the line and it should not be
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1776 * there move it left.
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1777 */
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1778 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1779 adjust_cursor_eol(void)
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1780 {
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1781 if (curwin->w_cursor.col > 0
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1782 && gchar_cursor() == NUL
773
8c9ef63b1ccc updated for version 7.0226
vimboss
parents: 714
diff changeset
1783 && (ve_flags & VE_ONEMORE) == 0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1784 && !(restart_edit || (State & INSERT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1785 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1786 // Put the cursor on the last character in the line.
555
a5efb97bc104 updated for version 7.0157
vimboss
parents: 530
diff changeset
1787 dec_cursor();
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
1788
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1789 if (ve_flags == VE_ALL)
557
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1790 {
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1791 colnr_T scol, ecol;
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1792
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1793 // Coladd is set to the width of the last character.
557
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1794 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol);
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1795 curwin->w_cursor.coladd = ecol - scol + 1;
862863033fdd updated for version 7.0158
vimboss
parents: 555
diff changeset
1796 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1800 /*
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1801 * If "process" is TRUE and the line begins with a comment leader (possibly
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1802 * after some white space), return a pointer to the text after it. Put a boolean
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1803 * value indicating whether the line ends with an unclosed comment in
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1804 * "is_comment".
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1805 * line - line to be processed,
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1806 * process - if FALSE, will only check whether the line ends with an unclosed
3584
443c50cd3e88 updated for version 7.3.552
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
1807 * comment,
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1808 * include_space - whether to also skip space following the comment leader,
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1809 * is_comment - will indicate whether the current line ends with an unclosed
3584
443c50cd3e88 updated for version 7.3.552
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
1810 * comment.
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1811 */
11131
8d9ecf09183a patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents: 11129
diff changeset
1812 char_u *
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1813 skip_comment(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1814 char_u *line,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1815 int process,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1816 int include_space,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1817 int *is_comment)
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1818 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1819 char_u *comment_flags = NULL;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1820 int lead_len;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1821 int leader_offset = get_last_leader_offset(line, &comment_flags);
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1822
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1823 *is_comment = FALSE;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1824 if (leader_offset != -1)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1825 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1826 // Let's check whether the line ends with an unclosed comment.
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1827 // If the last comment leader has COM_END in flags, there's no comment.
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1828 while (*comment_flags)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1829 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1830 if (*comment_flags == COM_END
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1831 || *comment_flags == ':')
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1832 break;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1833 ++comment_flags;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1834 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1835 if (*comment_flags != COM_END)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1836 *is_comment = TRUE;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1837 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1838
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1839 if (process == FALSE)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1840 return line;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1841
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1842 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space);
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1843
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1844 if (lead_len == 0)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1845 return line;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1846
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1847 // Find:
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1848 // - COM_END,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1849 // - colon,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1850 // whichever comes first.
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1851 while (*comment_flags)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1852 {
3580
297771eff080 updated for version 7.3.550
Bram Moolenaar <bram@vim.org>
parents: 3576
diff changeset
1853 if (*comment_flags == COM_END
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1854 || *comment_flags == ':')
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1855 break;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1856 ++comment_flags;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1857 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1858
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1859 // If we found a colon, it means that we are not processing a line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1860 // starting with a closing part of a three-part comment. That's good,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1861 // because we don't want to remove those as this would be annoying.
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1862 if (*comment_flags == ':' || *comment_flags == NUL)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1863 line += lead_len;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1864
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1865 return line;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1866 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1867
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1868 /*
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1869 * 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
1870 * When "save_undo" is TRUE save lines for undo first.
5848
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
1871 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
1872 * leaders should not be removed.
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
1873 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
1874 * to set those marks.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1875 *
1217
82274b284600 updated for version 7.1b
vimboss
parents: 1157
diff changeset
1876 * return FAIL for failure, OK otherwise
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1877 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1879 do_join(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1880 long count,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1881 int insert_space,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1882 int save_undo,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1883 int use_formatoptions UNUSED,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
1884 int setmark)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1885 {
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1886 char_u *curr = NULL;
2597
c3b5d3fe9404 updated for version 7.3.020
Bram Moolenaar <bram@vim.org>
parents: 2451
diff changeset
1887 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
1888 char_u *cend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 char_u *newp;
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1890 size_t newp_len;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1891 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
1892 int endcurr1 = NUL;
3e4574a4b627 Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents: 2298
diff changeset
1893 int endcurr2 = NUL;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1894 int currsize = 0; // size of the current line
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1895 int sumsize = 0; // size of the long new line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896 linenr_T t;
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1897 colnr_T col = 0;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1898 int ret = OK;
3574
4f4db5d661c4 updated for version 7.3.547
Bram Moolenaar <bram@vim.org>
parents: 3562
diff changeset
1899 int *comments = NULL;
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1900 int remove_comments = (use_formatoptions == TRUE)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1901 && has_format_option(FO_REMOVE_COMS);
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1902 int prev_was_comment;
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18619
diff changeset
1903 #ifdef FEAT_PROP_POPUP
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1904 int propcount = 0; // number of props over all joined lines
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1905 int props_remaining;
16678
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents: 16429
diff changeset
1906 #endif
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1907
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1908 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
1909 (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
1910 return FAIL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1911
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1912 // Allocate an array to store the number of spaces inserted before each
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1913 // line. We will use it to pre-compute the length of the new line and the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1914 // 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
1915 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
1916 if (spaces == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1917 return FAIL;
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1918 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1919 {
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
1920 comments = lalloc_clear(count * sizeof(int), TRUE);
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1921 if (comments == NULL)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1922 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1923 vim_free(spaces);
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1924 return FAIL;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1925 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1926 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1927
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1928 /*
16678
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents: 16429
diff changeset
1929 * 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
1930 * 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
1931 * This loops forward over the joined lines.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1932 */
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1933 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
1934 {
2597
c3b5d3fe9404 updated for version 7.3.020
Bram Moolenaar <bram@vim.org>
parents: 2451
diff changeset
1935 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1936 #ifdef FEAT_PROP_POPUP
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1937 propcount += count_props((linenr_T) (curwin->w_cursor.lnum + t), t > 0);
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
1938 #endif
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
1939 if (t == 0 && setmark && !cmdmod.lockmarks)
5664
647e6bb15aa3 updated for version 7.4.178
Bram Moolenaar <bram@vim.org>
parents: 5596
diff changeset
1940 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1941 // Set the '[ mark.
5664
647e6bb15aa3 updated for version 7.4.178
Bram Moolenaar <bram@vim.org>
parents: 5596
diff changeset
1942 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum;
647e6bb15aa3 updated for version 7.4.178
Bram Moolenaar <bram@vim.org>
parents: 5596
diff changeset
1943 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr);
647e6bb15aa3 updated for version 7.4.178
Bram Moolenaar <bram@vim.org>
parents: 5596
diff changeset
1944 }
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1945 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1946 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1947 // We don't want to remove the comment leader if the
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1948 // previous line is not a comment.
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1949 if (t > 0 && prev_was_comment)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1950 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1951
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1952 char_u *new_curr = skip_comment(curr, TRUE, insert_space,
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1953 &prev_was_comment);
3576
8625e38066db updated for version 7.3.548
Bram Moolenaar <bram@vim.org>
parents: 3574
diff changeset
1954 comments[t] = (int)(new_curr - curr);
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1955 curr = new_curr;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1956 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1957 else
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1958 curr = skip_comment(curr, FALSE, insert_space,
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1959 &prev_was_comment);
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1960 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
1961
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1962 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
1963 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1964 curr = skipwhite(curr);
18599
9cbdd58eeeb2 patch 8.1.2293: join adds trailing space when second line is empty
Bram Moolenaar <Bram@vim.org>
parents: 18574
diff changeset
1965 if (*curr != NUL && *curr != ')'
18914
4c0b420e7327 patch 8.2.0018: :join does not add white space where it should
Bram Moolenaar <Bram@vim.org>
parents: 18882
diff changeset
1966 && sumsize != 0 && endcurr1 != TAB
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1967 && (!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
1968 || (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
1969 && (!has_format_option(FO_MBYTE_JOIN2)
20695
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal
Bram Moolenaar <Bram@vim.org>
parents: 20655
diff changeset
1970 || (mb_ptr2char(curr) < 0x100
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal
Bram Moolenaar <Bram@vim.org>
parents: 20655
diff changeset
1971 && !(enc_utf8 && utf_eat_space(endcurr1)))
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal
Bram Moolenaar <Bram@vim.org>
parents: 20655
diff changeset
1972 || (endcurr1 < 0x100
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal
Bram Moolenaar <Bram@vim.org>
parents: 20655
diff changeset
1973 && !(enc_utf8 && utf_eat_space(mb_ptr2char(curr)))))
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1974 )
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1975 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1976 // don't add a space if the line is ending in a space
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1977 if (endcurr1 == ' ')
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1978 endcurr1 = endcurr2;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1979 else
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1980 ++spaces[t];
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
1981 // extra space when 'joinspaces' set and line ends in '.'
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1982 if ( p_js
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1983 && (endcurr1 == '.'
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1984 || (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
1985 && (endcurr1 == '?' || endcurr1 == '!'))))
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1986 ++spaces[t];
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1987 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1988 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1989 currsize = (int)STRLEN(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1990 sumsize += currsize + spaces[t];
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1991 endcurr1 = endcurr2 = NUL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1992 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
1993 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1994 if (has_mbyte)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1995 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1996 cend = curr + currsize;
11127
506f5d8b7d8b patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
1997 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
1998 endcurr1 = (*mb_ptr2char)(cend);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
1999 if (cend > curr)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2000 {
11127
506f5d8b7d8b patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
2001 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
2002 endcurr2 = (*mb_ptr2char)(cend);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2003 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2004 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2005 else
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2006 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2007 endcurr1 = *(curr + currsize - 1);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2008 if (currsize > 1)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2009 endcurr2 = *(curr + currsize - 2);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2010 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2011 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2012 line_breakcheck();
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2013 if (got_int)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2014 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2015 ret = FAIL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2016 goto theend;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2017 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2018 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2019
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2020 // store the column position before last line
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2021 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
2022
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2023 // allocate the space for the new line
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2024 newp_len = sumsize + 1;
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2025 #ifdef FEAT_PROP_POPUP
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2026 newp_len += propcount * sizeof(textprop_T);
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2027 #endif
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2028 newp = alloc(newp_len);
17797
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
2029 if (newp == NULL)
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
2030 {
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
2031 ret = FAIL;
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
2032 goto theend;
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
2033 }
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2034 cend = newp + sumsize;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2035 *cend = 0;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2036
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2037 /*
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2038 * 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
2039 * 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
2040 *
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2041 * 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
2042 * 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
2043 * 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
2044 */
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2045 #ifdef FEAT_PROP_POPUP
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2046 props_remaining = propcount;
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2047 #endif
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2048 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
2049 {
15326
fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents: 15062
diff changeset
2050 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
2051
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2052 cend -= currsize;
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2053 mch_memmove(cend, curr, (size_t)currsize);
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2054
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2055 if (spaces[t] > 0)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2056 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2057 cend -= spaces[t];
6929
e55929fca0cf patch 7.4.783
Bram Moolenaar <bram@vim.org>
parents: 6927
diff changeset
2058 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
2059 }
15326
fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents: 15062
diff changeset
2060
fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents: 15062
diff changeset
2061 // 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
2062 // 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
2063 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
2064
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2065 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
2066 (long)(cend - newp - spaces_removed), spaces_removed);
20583
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2067 #ifdef FEAT_PROP_POPUP
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2068 prepend_joined_props(newp + sumsize + 1, propcount, &props_remaining,
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2069 curwin->w_cursor.lnum + t, t == count - 1,
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2070 (long)(cend - newp), spaces_removed);
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2071 #endif
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 20237
diff changeset
2072
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2073 if (t == 0)
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2074 break;
2597
c3b5d3fe9404 updated for version 7.3.020
Bram Moolenaar <bram@vim.org>
parents: 2451
diff changeset
2075 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
2076 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
2077 curr += comments[t - 1];
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2078 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
2079 curr = skipwhite(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2080 currsize = (int)STRLEN(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2081 }
16678
6f453673eb19 patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents: 16429
diff changeset
2082
20655
707b21559848 patch 8.2.0881: compiler warning for argument type
Bram Moolenaar <Bram@vim.org>
parents: 20613
diff changeset
2083 ml_replace_len(curwin->w_cursor.lnum, newp, (colnr_T)newp_len, TRUE, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2084
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
2085 if (setmark && !cmdmod.lockmarks)
5848
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
2086 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2087 // Set the '] mark.
5848
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
2088 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
2089 curwin->w_buffer->b_op_end.col = (colnr_T)sumsize;
5848
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5828
diff changeset
2090 }
5664
647e6bb15aa3 updated for version 7.4.178
Bram Moolenaar <bram@vim.org>
parents: 5596
diff changeset
2091
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2092 // Only report the change in the first line here, del_lines() will report
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2093 // the deleted line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 changed_lines(curwin->w_cursor.lnum, currsize,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2095 curwin->w_cursor.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2096 /*
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2097 * Delete following lines. To do this we move the cursor there
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2098 * briefly, and then move it back. After del_lines() the cursor may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2099 * have moved up (last line deleted), so the current lnum is kept in t.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2100 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2101 t = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2102 ++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
2103 del_lines(count - 1, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2104 curwin->w_cursor.lnum = t;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2105
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2106 /*
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2107 * Set the cursor column:
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2108 * 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
2109 * vim: use the column of the last join
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2110 */
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2111 curwin->w_cursor.col =
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2112 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2113 check_cursor_col();
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2114
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2115 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2116 curwin->w_set_curswant = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2117
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2118 theend:
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2119 vim_free(spaces);
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
2120 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 3510
diff changeset
2121 vim_free(comments);
2294
2209060c340d Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 2289
diff changeset
2122 return ret;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2123 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2124
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2125 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2126 * prepare a few things for block mode yank/delete/tilde
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2127 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2128 * for delete:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129 * - textlen includes the first/last char to be (partly) deleted
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 * - start/endspaces is the number of columns that are taken by the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131 * first/last deleted char minus the number of columns that have to be
1839
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
2132 * deleted.
df7ceb64b0c6 updated for version 7.2-137
vimboss
parents: 1766
diff changeset
2133 * for yank and tilde:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 * - textlen includes the first/last char to be wholly yanked
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 * - start/endspaces is the number of columns of the first/last yanked char
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 * that are to be yanked.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137 */
18164
f57481564f2c patch 8.1.2077: the ops.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18100
diff changeset
2138 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2139 block_prep(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2140 oparg_T *oap,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2141 struct block_def *bdp,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2142 linenr_T lnum,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2143 int is_del)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2144 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2145 int incr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2146 char_u *pend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2147 char_u *pstart;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2148 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2149 char_u *prev_pstart;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150 char_u *prev_pend;
19176
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2151 #ifdef FEAT_LINEBREAK
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2152 int lbr_saved = curwin->w_p_lbr;
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2153
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2154 // Avoid a problem with unwanted linebreaks in block mode.
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2155 curwin->w_p_lbr = FALSE;
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2156 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 bdp->startspaces = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158 bdp->endspaces = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 bdp->textlen = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2160 bdp->start_vcol = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2161 bdp->end_vcol = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2162 bdp->is_short = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2163 bdp->is_oneChar = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 bdp->pre_whitesp = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2165 bdp->pre_whitesp_c = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2166 bdp->end_char_vcols = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2167 bdp->start_char_vcols = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2168
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169 line = ml_get(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 pstart = line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 prev_pstart = line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 while (bdp->start_vcol < oap->start_vcol && *pstart)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2174 // Count a tab for what it's worth (if list mode not on)
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5981
diff changeset
2175 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 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
2177 if (VIM_ISWHITE(*pstart))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179 bdp->pre_whitesp += incr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 bdp->pre_whitesp_c++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2181 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2183 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2184 bdp->pre_whitesp = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2185 bdp->pre_whitesp_c = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2186 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2187 prev_pstart = pstart;
11127
506f5d8b7d8b patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
2188 MB_PTR_ADV(pstart);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 bdp->start_char_vcols = incr;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2191 if (bdp->start_vcol < oap->start_vcol) // line too short
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2192 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2193 bdp->end_vcol = bdp->start_vcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2194 bdp->is_short = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2195 if (!is_del || oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2196 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2197 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2198 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2199 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2200 // notice: this converts partly selected Multibyte characters to
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2201 // spaces, too.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2202 bdp->startspaces = bdp->start_vcol - oap->start_vcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2203 if (is_del && bdp->startspaces)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2204 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2205 pend = pstart;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2206 bdp->end_vcol = bdp->start_vcol;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2207 if (bdp->end_vcol > oap->end_vcol) // it's all in one character
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2208 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2209 bdp->is_oneChar = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2210 if (oap->op_type == OP_INSERT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2211 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2212 else if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2213 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2214 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2215 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2216 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2217 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2218 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2219 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2220 if (is_del && oap->op_type != OP_LSHIFT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2221 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2222 // just putting the sum of those two into
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2223 // bdp->startspaces doesn't work for Visual replace,
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2224 // so we have to split the tab in two
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2225 bdp->startspaces = bdp->start_char_vcols
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2226 - (bdp->start_vcol - oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2227 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2228 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2229 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2230 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2231 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2232 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2233 prev_pend = pend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2234 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2235 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2236 // Count a tab for what it's worth (if list mode not on)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2237 prev_pend = pend;
6535
f9d02ce2f745 updated for version 7.4.594
Bram Moolenaar <bram@vim.org>
parents: 6508
diff changeset
2238 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2239 bdp->end_vcol += incr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2240 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2241 if (bdp->end_vcol <= oap->end_vcol
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2242 && (!is_del
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2243 || oap->op_type == OP_APPEND
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2244 || oap->op_type == OP_REPLACE)) // line too short
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2245 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2246 bdp->is_short = TRUE;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2247 // Alternative: include spaces to fill up the block.
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2248 // Disadvantage: can lead to trailing spaces when the line is
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2249 // short where the text is put
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2250 // if (!is_del || oap->op_type == OP_APPEND)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2251 if (oap->op_type == OP_APPEND || virtual_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2252 bdp->endspaces = oap->end_vcol - bdp->end_vcol
593
d220eb88e4e4 updated for version 7.0168
vimboss
parents: 557
diff changeset
2253 + oap->inclusive;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2254 else
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2255 bdp->endspaces = 0; // replace doesn't add characters
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2256 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2257 else if (bdp->end_vcol > oap->end_vcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2258 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2259 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2260 if (!is_del && bdp->endspaces)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2261 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2262 bdp->endspaces = incr - bdp->endspaces;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2263 if (pend != pstart)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2264 pend = prev_pend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2265 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2266 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2267 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2268 bdp->end_char_vcols = incr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2269 if (is_del && bdp->startspaces)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2270 pstart = prev_pstart;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2271 bdp->textlen = (int)(pend - pstart);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2272 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2273 bdp->textcol = (colnr_T) (pstart - line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2274 bdp->textstart = pstart;
19176
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2275 #ifdef FEAT_LINEBREAK
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2276 curwin->w_p_lbr = lbr_saved;
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
2277 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2278 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2279
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2280 /*
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2281 * Handle the add/subtract operator.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2282 */
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2283 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2284 op_addsub(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2285 oparg_T *oap,
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2286 linenr_T Prenum1, // Amount of add/subtract
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2287 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
2288 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2289 pos_T pos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2290 struct block_def bd;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2291 int change_cnt = 0;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2292 linenr_T amount = Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2293
15048
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2294 // 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
2295 // 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
2296 // 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
2297 #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
2298 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
2299 #endif
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2300
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2301 if (!VIsual_active)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2302 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2303 pos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2304 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
2305 {
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2306 #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
2307 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
2308 #endif
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2309 return;
15048
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2310 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2311 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
2312 #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
2313 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
2314 #endif
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2315 if (change_cnt)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2316 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
2317 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2318 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2319 {
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2320 int one_change;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2321 int length;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2322 pos_T startpos;
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2323
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2324 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
2325 (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
2326 {
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2327 #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
2328 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
2329 #endif
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2330 return;
15048
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2331 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2332
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2333 pos = oap->start;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2334 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
2335 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2336 if (oap->block_mode) // Visual block mode
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2337 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2338 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
2339 pos.col = bd.textcol;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2340 length = bd.textlen;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2341 }
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2342 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
2343 {
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2344 curwin->w_cursor.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2345 pos.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2346 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
2347 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2348 else // oap->motion_type == MCHAR
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2349 {
12996
973a0037f4c3 patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents: 12642
diff changeset
2350 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
2351 dec(&(oap->end));
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2352 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
2353 pos.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2354 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
2355 {
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2356 pos.col += oap->start.col;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2357 length -= oap->start.col;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2358 }
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2359 if (pos.lnum == oap->end.lnum)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2360 {
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2361 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
2362 if (oap->end.col >= length)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2363 oap->end.col = length - 1;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2364 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
2365 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2366 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2367 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
2368 if (one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2369 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2370 // Remember the start position of the first change.
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2371 if (change_cnt == 0)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2372 startpos = curbuf->b_op_start;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2373 ++change_cnt;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2374 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2375
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2376 #ifdef FEAT_NETBEANS_INTG
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2377 if (netbeans_active() && one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2378 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2379 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
2380
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2381 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
2382 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
2383 &ptr[pos.col], length);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2384 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2385 #endif
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2386 if (g_cmd && one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2387 amount += Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2388 }
15048
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2389
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents: 14862
diff changeset
2390 #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
2391 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
2392 #endif
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2393 if (change_cnt)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2394 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
2395
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2396 if (!change_cnt && oap->is_VIsual)
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2397 // No change: need to remove the Visual selection
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2398 redraw_curbuf_later(INVERTED);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2399
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2400 // Set '[ mark if something changed. Keep the last end
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2401 // position from do_addsub().
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
2402 if (change_cnt > 0 && !cmdmod.lockmarks)
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2403 curbuf->b_op_start = startpos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2404
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2405 if (change_cnt > p_report)
19760
9daed26b788b patch 8.2.0436: no warnings for incorrect printf arguments
Bram Moolenaar <Bram@vim.org>
parents: 19665
diff changeset
2406 smsg(NGETTEXT("%d line changed", "%d lines changed",
14585
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents: 14424
diff changeset
2407 change_cnt), change_cnt);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2408 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2409 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2410
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2411 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2412 * 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
2413 * 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
2414 *
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2415 * 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
2416 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2417 static int
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2418 do_addsub(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2419 int op_type,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2420 pos_T *pos,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2421 int length,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2422 linenr_T Prenum1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2423 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2424 int col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2425 char_u *buf1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2426 char_u buf2[NUMBUFLEN];
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2427 int pre; // 'X'/'x': hex; '0': octal; 'B'/'b': bin
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2428 static int hexupper = FALSE; // 0xABC
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2429 uvarnumber_T n;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2430 uvarnumber_T oldn;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2431 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2432 int c;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2433 int todel;
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2434 int do_hex;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2435 int do_oct;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2436 int do_bin;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2437 int do_alpha;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2438 int do_unsigned;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439 int firstdigit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2440 int subtract;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2441 int negative = FALSE;
6891
f9876721bedc patch 7.4.765
Bram Moolenaar <bram@vim.org>
parents: 6868
diff changeset
2442 int was_positive = TRUE;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2443 int visual = VIsual_active;
6921
1f78058351a6 patch 7.4.779
Bram Moolenaar <bram@vim.org>
parents: 6919
diff changeset
2444 int did_change = FALSE;
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2445 pos_T save_cursor = curwin->w_cursor;
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2446 int maxlen = 0;
7570
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2447 pos_T startpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2448 pos_T endpos;
20822
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2449 colnr_T save_coladd = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2450
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2451 do_hex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); // "heX"
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2452 do_oct = (vim_strchr(curbuf->b_p_nf, 'o') != NULL); // "Octal"
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2453 do_bin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); // "Bin"
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2454 do_alpha = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); // "alPha"
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2455 do_unsigned = (vim_strchr(curbuf->b_p_nf, 'u') != NULL); // "Unsigned"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2456
20822
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2457 if (virtual_active())
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2458 {
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2459 save_coladd = pos->coladd;
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2460 pos->coladd = 0;
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2461 }
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2462
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2463 curwin->w_cursor = *pos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2464 ptr = ml_get(pos->lnum);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2465 col = pos->col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2466
20822
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2467 if (*ptr == NUL || col + !!save_coladd >= (int)STRLEN(ptr))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2468 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2469
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2470 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471 * First check if we are on a hexadecimal number, after the "0x".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2472 */
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2473 if (!VIsual_active)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2474 {
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2475 if (do_bin)
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2476 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
2477 {
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2478 --col;
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2479 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2480 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
2481 }
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2482
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2483 if (do_hex)
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2484 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
2485 {
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2486 --col;
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2487 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2488 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
2489 }
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2490
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2491 if ( do_bin
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2492 && do_hex
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2493 && ! ((col > 0
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2494 && (ptr[col] == 'X'
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2495 || ptr[col] == 'x')
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2496 && ptr[col - 1] == '0'
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2497 && (!has_mbyte ||
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2498 !(*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
2499 && vim_isxdigit(ptr[col + 1]))))
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2500 {
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2501
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2502 // In case of binary/hexadecimal pattern overlap match, rescan
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2503
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2504 col = pos->col;
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2505
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2506 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
2507 {
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2508 col--;
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2509 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2510 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
2511 }
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2512 }
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2513
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2514 if (( do_hex
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2515 && col > 0
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2516 && (ptr[col] == 'X'
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2517 || ptr[col] == 'x')
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2518 && ptr[col - 1] == '0'
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2519 && (!has_mbyte ||
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2520 !(*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
2521 && vim_isxdigit(ptr[col + 1])) ||
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2522 ( do_bin
7447
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2523 && col > 0
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2524 && (ptr[col] == 'B'
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2525 || ptr[col] == 'b')
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents: 7336
diff changeset
2526 && ptr[col - 1] == '0'
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2527 && (!has_mbyte ||
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2528 !(*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
2529 && vim_isbdigit(ptr[col + 1])))
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2530 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2531 // Found hexadecimal or binary number, move to its start.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2532 --col;
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2533 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2534 col -= (*mb_head_off)(ptr, ptr + col);
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2535 }
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2536 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2537 {
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2538 /*
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2539 * Search forward and then backward to find the start of number.
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2540 */
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2541 col = pos->col;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2542
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2543 while (ptr[col] != NUL
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2544 && !vim_isdigit(ptr[col])
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2545 && !(do_alpha && ASCII_ISALPHA(ptr[col])))
18251
c8a53c0daeed patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents: 18219
diff changeset
2546 col += mb_ptr2len(ptr + col);
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2547
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2548 while (col > 0
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2549 && vim_isdigit(ptr[col - 1])
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2550 && !(do_alpha && ASCII_ISALPHA(ptr[col])))
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2551 {
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2552 --col;
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2553 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2554 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
2555 }
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2556 }
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2557 }
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2558
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2559 if (visual)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2560 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2561 while (ptr[col] != NUL && length > 0
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2562 && !vim_isdigit(ptr[col])
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2563 && !(do_alpha && ASCII_ISALPHA(ptr[col])))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2564 {
18251
c8a53c0daeed patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents: 18219
diff changeset
2565 int mb_len = mb_ptr2len(ptr + col);
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2566
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2567 col += mb_len;
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2568 length -= mb_len;
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2569 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2570
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2571 if (length == 0)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2572 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2573
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2574 if (col > pos->col && ptr[col - 1] == '-'
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2575 && (!has_mbyte || !(*mb_head_off)(ptr, ptr + col - 1))
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2576 && !do_unsigned)
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2577 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2578 negative = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2579 was_positive = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2580 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2581 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2582
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2583 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2584 * 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
2585 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2586 firstdigit = ptr[col];
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2587 if (!VIM_ISDIGIT(firstdigit) && !(do_alpha && ASCII_ISALPHA(firstdigit)))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2588 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2589 beep_flush();
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2590 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2591 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2592
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2593 if (do_alpha && ASCII_ISALPHA(firstdigit))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2594 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2595 // decrement or increment alphabetic character
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2596 if (op_type == OP_NR_SUB)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2597 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2598 if (CharOrd(firstdigit) < Prenum1)
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2599 {
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2600 if (isupper(firstdigit))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2601 firstdigit = 'A';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2602 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2603 firstdigit = 'a';
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2604 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2605 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2606 #ifdef EBCDIC
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2607 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2608 #else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2609 firstdigit -= Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2610 #endif
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2611 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2612 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2613 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2614 if (26 - CharOrd(firstdigit) - 1 < Prenum1)
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2615 {
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2616 if (isupper(firstdigit))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2617 firstdigit = 'Z';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2618 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2619 firstdigit = 'z';
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2620 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2621 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2622 #ifdef EBCDIC
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2623 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2624 #else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2625 firstdigit += Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2626 #endif
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2627 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2628 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2629 if (!did_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2630 startpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2631 did_change = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2632 (void)del_char(FALSE);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2633 ins_char(firstdigit);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2634 endpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2635 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2636 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2637 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2638 {
9332
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2639 if (col > 0 && ptr[col - 1] == '-'
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2640 && (!has_mbyte ||
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents: 9307
diff changeset
2641 !(*mb_head_off)(ptr, ptr + col - 1))
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2642 && !visual
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2643 && !do_unsigned)
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2644 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2645 // negative number
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2646 --col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2647 negative = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2648 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2649 // get the number value (unsigned)
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2650 if (visual && VIsual_mode != 'V')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2651 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
2652 ? (int)STRLEN(ptr) - col
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2653 : length);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2654
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2655 vim_str2nr(ptr + col, &pre, &length,
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2656 0 + (do_bin ? STR2NR_BIN : 0)
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2657 + (do_oct ? STR2NR_OCT : 0)
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2658 + (do_hex ? 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
2659 NULL, &n, maxlen, FALSE);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2660
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2661 // ignore leading '-' for hex and octal and bin numbers
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2662 if (pre && negative)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2663 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2664 ++col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2665 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2666 negative = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2667 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2668 // add or subtract
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2669 subtract = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2670 if (op_type == OP_NR_SUB)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2671 subtract ^= TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2672 if (negative)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2673 subtract ^= TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2674
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2675 oldn = n;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2676 if (subtract)
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2677 n -= (uvarnumber_T)Prenum1;
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2678 else
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2679 n += (uvarnumber_T)Prenum1;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2680 // handle wraparound for decimal numbers
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2681 if (!pre)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2682 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2683 if (subtract)
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2684 {
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2685 if (n > oldn)
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2686 {
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2687 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
2688 negative ^= TRUE;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2689 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2690 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2691 else
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2692 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2693 // add
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2694 if (n < oldn)
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2695 {
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2696 n = (n ^ (uvarnumber_T)-1);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2697 negative ^= TRUE;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2698 }
6927
58d9f967ae1a patch 7.4.782
Bram Moolenaar <bram@vim.org>
parents: 6923
diff changeset
2699 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2700 if (n == 0)
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2701 negative = FALSE;
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2702 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2703
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2704 if (do_unsigned && negative)
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2705 {
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2706 if (subtract)
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2707 // sticking at zero.
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2708 n = (uvarnumber_T)0;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2709 else
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2710 // sticking at 2^64 - 1.
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2711 n = (uvarnumber_T)(-1);
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2712 negative = FALSE;
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2713 }
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2714
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2715 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
2716 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2717 // need to remove the '-'
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2718 col--;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2719 length++;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2720 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2721
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2722 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2723 * Delete the old number.
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2724 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2725 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2726 if (!did_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2727 startpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2728 did_change = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2729 todel = length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2730 c = gchar_cursor();
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2731 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2732 * 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
2733 * 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
2734 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2735 if (c == '-')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2736 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2737 while (todel-- > 0)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2738 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2739 if (c < 0x100 && isalpha(c))
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2740 {
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2741 if (isupper(c))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2742 hexupper = TRUE;
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2743 else
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2744 hexupper = FALSE;
6891
f9876721bedc patch 7.4.765
Bram Moolenaar <bram@vim.org>
parents: 6868
diff changeset
2745 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2746 // del_char() will mark line needing displaying
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2747 (void)del_char(FALSE);
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2748 c = gchar_cursor();
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2749 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2750
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2751 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2752 * Prepare the leading characters in buf1[].
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2753 * 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
2754 * Allocate a bit too much.
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2755 */
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
2756 buf1 = alloc(length + NUMBUFLEN);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2757 if (buf1 == NULL)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2758 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2759 ptr = buf1;
8989
e600e696c0a1 commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents: 8863
diff changeset
2760 if (negative && (!visual || was_positive))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2761 *ptr++ = '-';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2762 if (pre)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2763 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2764 *ptr++ = '0';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2765 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2766 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2767 if (pre == 'b' || pre == 'B' ||
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2768 pre == 'x' || pre == 'X')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2769 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2770 *ptr++ = pre;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2771 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2772 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2773
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2774 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2775 * Put the number characters in buf2[].
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2776 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2777 if (pre == 'b' || pre == 'B')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2778 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2779 int i;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2780 int bit = 0;
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2781 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
2782
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2783 // leading zeros
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2784 for (bit = bits; bit > 0; bit--)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2785 if ((n >> (bit - 1)) & 0x1) break;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2786
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2787 for (i = 0; bit > 0; bit--)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2788 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
2789
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2790 buf2[i] = '\0';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2791 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2792 else if (pre == 0)
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
2793 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", (uvarnumber_T)n);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2794 else if (pre == '0')
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
2795 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", (uvarnumber_T)n);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2796 else if (pre && hexupper)
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
2797 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", (uvarnumber_T)n);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2798 else
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
2799 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", (uvarnumber_T)n);
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2800 length -= (int)STRLEN(buf2);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2801
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2802 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2803 * 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
2804 * 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
2805 * Don't do this when
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2806 * 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
2807 */
20613
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers
Bram Moolenaar <Bram@vim.org>
parents: 20583
diff changeset
2808 if (firstdigit == '0' && !(do_oct && pre == 0))
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2809 while (length-- > 0)
6868
9798a98a1583 patch 7.4.754
Bram Moolenaar <bram@vim.org>
parents: 6845
diff changeset
2810 *ptr++ = '0';
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2811 *ptr = NUL;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2812 STRCAT(buf1, buf2);
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2813 ins_str(buf1); // insert the new number
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2814 vim_free(buf1);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2815 endpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2816 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
2817 --curwin->w_cursor.col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2818 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2819
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
2820 if (did_change && !cmdmod.lockmarks)
7570
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2821 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2822 // set the '[ and '] marks
7570
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2823 curbuf->b_op_start = startpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2824 curbuf->b_op_end = endpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2825 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
2826 --curbuf->b_op_end.col;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents: 7551
diff changeset
2827 }
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2828
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2829 theend:
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2830 if (visual)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2831 curwin->w_cursor = save_cursor;
8690
6a1becf4f282 commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents: 8399
diff changeset
2832 else if (did_change)
6a1becf4f282 commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents: 8399
diff changeset
2833 curwin->w_set_curswant = TRUE;
20822
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2834 else if (virtual_active())
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit'
Bram Moolenaar <Bram@vim.org>
parents: 20695
diff changeset
2835 curwin->w_cursor.coladd = save_coladd;
7576
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents: 7574
diff changeset
2836
7574
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents: 7570
diff changeset
2837 return did_change;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2838 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2839
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2840 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2841 clear_oparg(oparg_T *oap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2842 {
20007
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents: 19774
diff changeset
2843 CLEAR_POINTER(oap);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2844 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2845
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2846 /*
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2847 * Count the number of bytes, characters and "words" in a line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2848 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2849 * "Words" are counted by looking for boundaries between non-space and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2850 * space characters. (it seems to produce results that match 'wc'.)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2851 *
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2852 * Return value is byte count; word count for the line is added to "*wc".
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2853 * Char count is added to "*cc".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2854 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2855 * The function will only examine the first "limit" characters in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2856 * line, stopping if it encounters an end-of-line (NUL byte). In that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2857 * case, eol_size will be added to the character count to account for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2858 * the size of the EOL character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2859 */
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2860 static varnumber_T
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2861 line_count_info(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2862 char_u *line,
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2863 varnumber_T *wc,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2864 varnumber_T *cc,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2865 varnumber_T limit,
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2866 int eol_size)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2867 {
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2868 varnumber_T i;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2869 varnumber_T words = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2870 varnumber_T chars = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2871 int is_word = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2872
3626
802b1a1b275f updated for version 7.3.573
Bram Moolenaar <bram@vim.org>
parents: 3584
diff changeset
2873 for (i = 0; i < limit && line[i] != NUL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2874 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2875 if (is_word)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2876 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2877 if (vim_isspace(line[i]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2878 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2879 words++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2880 is_word = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2881 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2882 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2883 else if (!vim_isspace(line[i]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2884 is_word = 1;
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2885 ++chars;
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 446
diff changeset
2886 i += (*mb_ptr2len)(line + i);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2887 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2888
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2889 if (is_word)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2890 words++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2891 *wc += words;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2892
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2893 // Add eol_size if the end of line was reached before hitting limit.
2996
b9182da84c7e updated for version 7.3.270
Bram Moolenaar <bram@vim.org>
parents: 2957
diff changeset
2894 if (i < limit && line[i] == NUL)
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2895 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2896 i += eol_size;
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2897 chars += eol_size;
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2898 }
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2899 *cc += chars;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2900 return i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2901 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2902
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2903 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2904 * Give some info about the position of the cursor (for "g CTRL-G").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2905 * In Visual mode, give some info about the selected region. (In this case,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2906 * 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
2907 * When "dict" is not NULL store the info there instead of showing it.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2908 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2909 void
7829
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
2910 cursor_pos_info(dict_T *dict)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2911 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2912 char_u *p;
274
8fa8d7964cf1 updated for version 7.0073
vimboss
parents: 237
diff changeset
2913 char_u buf1[50];
8fa8d7964cf1 updated for version 7.0073
vimboss
parents: 237
diff changeset
2914 char_u buf2[40];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2915 linenr_T lnum;
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2916 varnumber_T byte_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2917 varnumber_T bom_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2918 varnumber_T byte_count_cursor = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2919 varnumber_T char_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2920 varnumber_T char_count_cursor = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2921 varnumber_T word_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2922 varnumber_T word_count_cursor = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2923 int eol_size;
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
2924 varnumber_T last_check = 100000L;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2925 long line_count_selected = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2926 pos_T min_pos, max_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2927 oparg_T oparg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2928 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2929
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2930 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2931 * Compute the length of the file in characters.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2932 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2933 if (curbuf->b_ml.ml_flags & ML_EMPTY)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2934 {
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
2935 if (dict == NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
2936 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15517
diff changeset
2937 msg(_(no_lines_msg));
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
2938 return;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
2939 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2940 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2941 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2942 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2943 if (get_fileformat(curbuf) == EOL_DOS)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2944 eol_size = 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2945 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2946 eol_size = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2947
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2948 if (VIsual_active)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2949 {
11121
778c10516955 patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11065
diff changeset
2950 if (LT_POS(VIsual, curwin->w_cursor))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2951 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2952 min_pos = VIsual;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2953 max_pos = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2954 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2955 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2956 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2957 min_pos = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2958 max_pos = VIsual;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2959 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2960 if (*p_sel == 'e' && max_pos.col > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2961 --max_pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2962
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2963 if (VIsual_mode == Ctrl_V)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2964 {
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2965 #ifdef FEAT_LINEBREAK
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2966 char_u * saved_sbr = p_sbr;
18574
8b0114ffde2b patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents: 18481
diff changeset
2967 char_u * saved_w_sbr = curwin->w_p_sbr;
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2968
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2969 // Make 'sbr' empty for a moment to get the correct size.
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2970 p_sbr = empty_option;
18574
8b0114ffde2b patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents: 18481
diff changeset
2971 curwin->w_p_sbr = empty_option;
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2972 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2973 oparg.is_VIsual = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2974 oparg.block_mode = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2975 oparg.op_type = OP_NOP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2976 getvcols(curwin, &min_pos, &max_pos,
688
bcd2edc4539e updated for version 7.0207
vimboss
parents: 681
diff changeset
2977 &oparg.start_vcol, &oparg.end_vcol);
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2978 #ifdef FEAT_LINEBREAK
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2979 p_sbr = saved_sbr;
18574
8b0114ffde2b patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents: 18481
diff changeset
2980 curwin->w_p_sbr = saved_w_sbr;
1866
c474f5691c0c updated for version 7.2-164
vimboss
parents: 1860
diff changeset
2981 #endif
688
bcd2edc4539e updated for version 7.0207
vimboss
parents: 681
diff changeset
2982 if (curwin->w_curswant == MAXCOL)
bcd2edc4539e updated for version 7.0207
vimboss
parents: 681
diff changeset
2983 oparg.end_vcol = MAXCOL;
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2984 // Swap the start, end vcol if needed
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2985 if (oparg.end_vcol < oparg.start_vcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2986 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2987 oparg.end_vcol += oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2988 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2989 oparg.end_vcol -= oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2990 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2991 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2992 line_count_selected = max_pos.lnum - min_pos.lnum + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2993 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2994
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2995 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2996 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2997 // Check for a CTRL-C every 100000 characters.
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
2998 if (byte_count > last_check)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2999 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3000 ui_breakcheck();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3001 if (got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3002 return;
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3003 last_check = byte_count + 100000L;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3004 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3005
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3006 // Do extra processing for VIsual mode.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3007 if (VIsual_active
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3008 && lnum >= min_pos.lnum && lnum <= max_pos.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3009 {
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3010 char_u *s = NULL;
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3011 long len = 0L;
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3012
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3013 switch (VIsual_mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3014 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3015 case Ctrl_V:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3016 virtual_op = virtual_active();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3017 block_prep(&oparg, &bd, lnum, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3018 virtual_op = MAYBE;
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3019 s = bd.textstart;
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3020 len = (long)bd.textlen;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3021 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3022 case 'V':
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3023 s = ml_get(lnum);
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3024 len = MAXCOL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3025 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3026 case 'v':
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3027 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3028 colnr_T start_col = (lnum == min_pos.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3029 ? min_pos.col : 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3030 colnr_T end_col = (lnum == max_pos.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3031 ? max_pos.col - start_col + 1 : MAXCOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3032
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3033 s = ml_get(lnum) + start_col;
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3034 len = end_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3035 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3036 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3037 }
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3038 if (s != NULL)
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3039 {
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3040 byte_count_cursor += line_count_info(s, &word_count_cursor,
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3041 &char_count_cursor, len, eol_size);
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3042 if (lnum == curbuf->b_ml.ml_line_count
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3043 && !curbuf->b_p_eol
6933
62ba356c2d4e patch 7.4.785
Bram Moolenaar <bram@vim.org>
parents: 6929
diff changeset
3044 && (curbuf->b_p_bin || !curbuf->b_p_fixeol)
50
90188be4861f updated for version 7.0028
vimboss
parents: 45
diff changeset
3045 && (long)STRLEN(s) < len)
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3046 byte_count_cursor -= eol_size;
45
e474bae3795f updated for version 7.0027
vimboss
parents: 39
diff changeset
3047 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3048 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3049 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3050 {
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3051 // In non-visual mode, check for the line the cursor is on
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3052 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3053 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3054 word_count_cursor += word_count;
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3055 char_count_cursor += char_count;
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3056 byte_count_cursor = byte_count +
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3057 line_count_info(ml_get(lnum),
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3058 &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
3059 (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
3060 eol_size);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3061 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3062 }
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3063 // Add to the running totals
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3064 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
3065 &char_count, (varnumber_T)MAXCOL,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
3066 eol_size);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3067 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3068
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3069 // Correction for when last line doesn't have an EOL.
6933
62ba356c2d4e patch 7.4.785
Bram Moolenaar <bram@vim.org>
parents: 6929
diff changeset
3070 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol))
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3071 byte_count -= eol_size;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3072
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3073 if (dict == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3074 {
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3075 if (VIsual_active)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3076 {
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3077 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
3078 {
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3079 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
3080 &max_pos.col);
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3081 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
3082 (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
3083 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3084 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3085 buf1[0] = NUL;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3086
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3087 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
3088 && char_count == byte_count)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3089 vim_snprintf((char *)IObuff, IOSIZE,
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
3090 _("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
3091 buf1, line_count_selected,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3092 (long)curbuf->b_ml.ml_line_count,
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3093 (varnumber_T)word_count_cursor,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3094 (varnumber_T)word_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3095 (varnumber_T)byte_count_cursor,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3096 (varnumber_T)byte_count);
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3097 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3098 vim_snprintf((char *)IObuff, IOSIZE,
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
3099 _("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
3100 buf1, line_count_selected,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3101 (long)curbuf->b_ml.ml_line_count,
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3102 (varnumber_T)word_count_cursor,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3103 (varnumber_T)word_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3104 (varnumber_T)char_count_cursor,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3105 (varnumber_T)char_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3106 (varnumber_T)byte_count_cursor,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3107 (varnumber_T)byte_count);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3108 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3109 else
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3110 {
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3111 p = ml_get_curline();
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3112 validate_virtcol();
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3113 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
3114 (int)curwin->w_virtcol + 1);
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3115 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
3116 linetabsize(p));
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3117
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3118 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
3119 && char_count == byte_count)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3120 vim_snprintf((char *)IObuff, IOSIZE,
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
3121 _("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
3122 (char *)buf1, (char *)buf2,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3123 (long)curwin->w_cursor.lnum,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3124 (long)curbuf->b_ml.ml_line_count,
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3125 (varnumber_T)word_count_cursor, (varnumber_T)word_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3126 (varnumber_T)byte_count_cursor, (varnumber_T)byte_count);
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3127 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3128 vim_snprintf((char *)IObuff, IOSIZE,
9389
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents: 9332
diff changeset
3129 _("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
3130 (char *)buf1, (char *)buf2,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3131 (long)curwin->w_cursor.lnum,
161
6df0106fc595 updated for version 7.0049
vimboss
parents: 140
diff changeset
3132 (long)curbuf->b_ml.ml_line_count,
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3133 (varnumber_T)word_count_cursor, (varnumber_T)word_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3134 (varnumber_T)char_count_cursor, (varnumber_T)char_count,
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3135 (varnumber_T)byte_count_cursor, (varnumber_T)byte_count);
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3136 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3137 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3138
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3139 bom_count = bomb_size();
18062
0b351691071c patch 8.1.2026: possibly using uninitialized memory
Bram Moolenaar <Bram@vim.org>
parents: 17797
diff changeset
3140 if (dict == NULL && bom_count > 0)
19005
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf()
Bram Moolenaar <Bram@vim.org>
parents: 18914
diff changeset
3141 {
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf()
Bram Moolenaar <Bram@vim.org>
parents: 18914
diff changeset
3142 size_t len = STRLEN(IObuff);
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf()
Bram Moolenaar <Bram@vim.org>
parents: 18914
diff changeset
3143
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf()
Bram Moolenaar <Bram@vim.org>
parents: 18914
diff changeset
3144 vim_snprintf((char *)IObuff + len, IOSIZE - len,
19477
2bb0e80fcd32 patch 8.2.0296: mixing up "long long" and __int64 may cause problems
Bram Moolenaar <Bram@vim.org>
parents: 19195
diff changeset
3145 _("(+%lld for BOM)"), (varnumber_T)bom_count);
19005
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf()
Bram Moolenaar <Bram@vim.org>
parents: 18914
diff changeset
3146 }
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3147 if (dict == NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3148 {
18062
0b351691071c patch 8.1.2026: possibly using uninitialized memory
Bram Moolenaar <Bram@vim.org>
parents: 17797
diff changeset
3149 // 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
3150 p = p_shm;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3151 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
3152 msg((char *)IObuff);
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3153 p_shm = p;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3154 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3155 }
7484
1fe988587423 commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents: 7480
diff changeset
3156 #if defined(FEAT_EVAL)
7480
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3157 if (dict != NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents: 7447
diff changeset
3158 {
14301
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents: 14216
diff changeset
3159 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
3160 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
3161 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
3162 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
3163 byte_count_cursor);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents: 14216
diff changeset
3164 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
3165 char_count_cursor);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents: 14216
diff changeset
3166 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
3167 word_count_cursor);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3168 }
7484
1fe988587423 commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents: 7480
diff changeset
3169 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3170 }
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3171
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3172 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3173 * Handle indent and format operators and visual mode ":".
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3174 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3175 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3176 op_colon(oparg_T *oap)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3177 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3178 stuffcharReadbuff(':');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3179 if (oap->is_VIsual)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3180 stuffReadbuff((char_u *)"'<,'>");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3181 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3182 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3183 // Make the range look nice, so it can be repeated.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3184 if (oap->start.lnum == curwin->w_cursor.lnum)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3185 stuffcharReadbuff('.');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3186 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3187 stuffnumReadbuff((long)oap->start.lnum);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3188 if (oap->end.lnum != oap->start.lnum)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3189 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3190 stuffcharReadbuff(',');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3191 if (oap->end.lnum == curwin->w_cursor.lnum)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3192 stuffcharReadbuff('.');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3193 else if (oap->end.lnum == curbuf->b_ml.ml_line_count)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3194 stuffcharReadbuff('$');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3195 else if (oap->start.lnum == curwin->w_cursor.lnum)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3196 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3197 stuffReadbuff((char_u *)".+");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3198 stuffnumReadbuff((long)oap->line_count - 1);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3199 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3200 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3201 stuffnumReadbuff((long)oap->end.lnum);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3202 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3203 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3204 if (oap->op_type != OP_COLON)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3205 stuffReadbuff((char_u *)"!");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3206 if (oap->op_type == OP_INDENT)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3207 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3208 #ifndef FEAT_CINDENT
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3209 if (*get_equalprg() == NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3210 stuffReadbuff((char_u *)"indent");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3211 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3212 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3213 stuffReadbuff(get_equalprg());
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3214 stuffReadbuff((char_u *)"\n");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3215 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3216 else if (oap->op_type == OP_FORMAT)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3217 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3218 if (*curbuf->b_p_fp != NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3219 stuffReadbuff(curbuf->b_p_fp);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3220 else if (*p_fp != NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3221 stuffReadbuff(p_fp);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3222 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3223 stuffReadbuff((char_u *)"fmt");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3224 stuffReadbuff((char_u *)"\n']");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3225 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3226
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3227 // do_cmdline() does the rest
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3228 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3229
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3230 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3231 * Handle the "g@" operator: call 'operatorfunc'.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3232 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3233 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3234 op_function(oparg_T *oap UNUSED)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3235 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3236 #ifdef FEAT_EVAL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3237 typval_T argv[2];
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3238 int save_virtual_op = virtual_op;
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3239 pos_T orig_start = curbuf->b_op_start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3240 pos_T orig_end = curbuf->b_op_end;
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3241
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3242 if (*p_opfunc == NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3243 emsg(_("E774: 'operatorfunc' is empty"));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3244 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3245 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3246 // Set '[ and '] marks to text to be operated on.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3247 curbuf->b_op_start = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3248 curbuf->b_op_end = oap->end;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3249 if (oap->motion_type != MLINE && !oap->inclusive)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3250 // Exclude the end position.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3251 decl(&curbuf->b_op_end);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3252
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3253 argv[0].v_type = VAR_STRING;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3254 if (oap->block_mode)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3255 argv[0].vval.v_string = (char_u *)"block";
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3256 else if (oap->motion_type == MLINE)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3257 argv[0].vval.v_string = (char_u *)"line";
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3258 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3259 argv[0].vval.v_string = (char_u *)"char";
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3260 argv[1].v_type = VAR_UNKNOWN;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3261
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3262 // Reset virtual_op so that 'virtualedit' can be changed in the
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3263 // function.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3264 virtual_op = MAYBE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3265
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3266 (void)call_func_retnr(p_opfunc, 1, argv);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3267
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3268 virtual_op = save_virtual_op;
18619
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3269 if (cmdmod.lockmarks)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3270 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3271 curbuf->b_op_start = orig_start;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3272 curbuf->b_op_end = orig_end;
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and ']
Bram Moolenaar <Bram@vim.org>
parents: 18599
diff changeset
3273 }
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3274 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3275 #else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3276 emsg(_("E775: Eval feature not available"));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3277 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3278 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3279
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3280 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3281 * Calculate start/end virtual columns for operating in block mode.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3282 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3283 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3284 get_op_vcol(
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3285 oparg_T *oap,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3286 colnr_T redo_VIsual_vcol,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3287 int initial) // when TRUE adjust position for 'selectmode'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3288 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3289 colnr_T start, end;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3290
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3291 if (VIsual_mode != Ctrl_V
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3292 || (!initial && oap->end.col < curwin->w_width))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3293 return;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3294
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3295 oap->block_mode = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3296
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3297 // prevent from moving onto a trail byte
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3298 if (has_mbyte)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3299 mb_adjustpos(curwin->w_buffer, &oap->end);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3300
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3301 getvvcol(curwin, &(oap->start), &oap->start_vcol, NULL, &oap->end_vcol);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3302
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3303 if (!redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3304 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3305 getvvcol(curwin, &(oap->end), &start, NULL, &end);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3306
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3307 if (start < oap->start_vcol)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3308 oap->start_vcol = start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3309 if (end > oap->end_vcol)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3310 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3311 if (initial && *p_sel == 'e' && start >= 1
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3312 && start - 1 >= oap->end_vcol)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3313 oap->end_vcol = start - 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3314 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3315 oap->end_vcol = end;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3316 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3317 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3318
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3319 // if '$' was used, get oap->end_vcol from longest line
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3320 if (curwin->w_curswant == MAXCOL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3321 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3322 curwin->w_cursor.col = MAXCOL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3323 oap->end_vcol = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3324 for (curwin->w_cursor.lnum = oap->start.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3325 curwin->w_cursor.lnum <= oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3326 ++curwin->w_cursor.lnum)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3327 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3328 getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &end);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3329 if (end > oap->end_vcol)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3330 oap->end_vcol = end;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3331 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3332 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3333 else if (redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3334 oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3335 // Correct oap->end.col and oap->start.col to be the
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3336 // upper-left and lower-right corner of the block area.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3337 //
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3338 // (Actually, this does convert column positions into character
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3339 // positions)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3340 curwin->w_cursor.lnum = oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3341 coladvance(oap->end_vcol);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3342 oap->end = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3343
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3344 curwin->w_cursor = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3345 coladvance(oap->start_vcol);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3346 oap->start = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3347 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3348
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3349 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3350 * Handle an operator after Visual mode or when the movement is finished.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3351 * "gui_yank" is true when yanking text for the clipboard.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3352 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3353 void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3354 do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3355 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3356 oparg_T *oap = cap->oap;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3357 pos_T old_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3358 int empty_region_error;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3359 int restart_edit_save;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3360 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3361 int lbr_saved = curwin->w_p_lbr;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3362 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3363
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3364 // The visual area is remembered for redo
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3365 static int redo_VIsual_mode = NUL; // 'v', 'V', or Ctrl-V
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3366 static linenr_T redo_VIsual_line_count; // number of lines
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3367 static colnr_T redo_VIsual_vcol; // number of cols or end column
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3368 static long redo_VIsual_count; // count for Visual operator
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3369 static int redo_VIsual_arg; // extra argument
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3370 int include_line_break = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3371
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3372 #if defined(FEAT_CLIPBOARD)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3373 // Yank the visual area into the GUI selection register before we operate
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3374 // on it and lose it forever.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3375 // Don't do it if a specific register was specified, so that ""x"*P works.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3376 // This could call do_pending_operator() recursively, but that's OK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3377 // because gui_yank will be TRUE for the nested call.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3378 if ((clip_star.available || clip_plus.available)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3379 && oap->op_type != OP_NOP
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3380 && !gui_yank
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3381 && VIsual_active
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3382 && !redo_VIsual_busy
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3383 && oap->regname == 0)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3384 clip_auto_select();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3385 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3386 old_cursor = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3387
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3388 // If an operation is pending, handle it...
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3389 if ((finish_op || VIsual_active) && oap->op_type != OP_NOP)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3390 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3391 // Yank can be redone when 'y' is in 'cpoptions', but not when yanking
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3392 // for the clipboard.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3393 int redo_yank = vim_strchr(p_cpo, CPO_YANK) != NULL && !gui_yank;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3394
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3395 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3396 // Avoid a problem with unwanted linebreaks in block mode.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3397 if (curwin->w_p_lbr)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3398 curwin->w_valid &= ~VALID_VIRTCOL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3399 curwin->w_p_lbr = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3400 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3401 oap->is_VIsual = VIsual_active;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3402 if (oap->motion_force == 'V')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3403 oap->motion_type = MLINE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3404 else if (oap->motion_force == 'v')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3405 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3406 // If the motion was linewise, "inclusive" will not have been set.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3407 // Use "exclusive" to be consistent. Makes "dvj" work nice.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3408 if (oap->motion_type == MLINE)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3409 oap->inclusive = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3410 // If the motion already was characterwise, toggle "inclusive"
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3411 else if (oap->motion_type == MCHAR)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3412 oap->inclusive = !oap->inclusive;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3413 oap->motion_type = MCHAR;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3414 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3415 else if (oap->motion_force == Ctrl_V)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3416 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3417 // Change line- or characterwise motion into Visual block mode.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3418 if (!VIsual_active)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3419 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3420 VIsual_active = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3421 VIsual = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3422 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3423 VIsual_mode = Ctrl_V;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3424 VIsual_select = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3425 VIsual_reselect = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3426 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3427
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3428 // Only redo yank when 'y' flag is in 'cpoptions'.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3429 // Never redo "zf" (define fold).
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3430 if ((redo_yank || oap->op_type != OP_YANK)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3431 && ((!VIsual_active || oap->motion_force)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3432 // Also redo Operator-pending Visual mode mappings
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3433 || (VIsual_active && cap->cmdchar == ':'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3434 && oap->op_type != OP_COLON))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3435 && cap->cmdchar != 'D'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3436 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3437 && oap->op_type != OP_FOLD
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3438 && oap->op_type != OP_FOLDOPEN
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3439 && oap->op_type != OP_FOLDOPENREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3440 && oap->op_type != OP_FOLDCLOSE
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3441 && oap->op_type != OP_FOLDCLOSEREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3442 && oap->op_type != OP_FOLDDEL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3443 && oap->op_type != OP_FOLDDELREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3444 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3445 )
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3446 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3447 prep_redo(oap->regname, cap->count0,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3448 get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3449 oap->motion_force, cap->cmdchar, cap->nchar);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3450 if (cap->cmdchar == '/' || cap->cmdchar == '?') // was a search
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3451 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3452 // If 'cpoptions' does not contain 'r', insert the search
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3453 // pattern to really repeat the same command.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3454 if (vim_strchr(p_cpo, CPO_REDO) == NULL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3455 AppendToRedobuffLit(cap->searchbuf, -1);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3456 AppendToRedobuff(NL_STR);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3457 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3458 else if (cap->cmdchar == ':')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3459 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3460 // do_cmdline() has stored the first typed line in
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3461 // "repeat_cmdline". When several lines are typed repeating
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3462 // won't be possible.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3463 if (repeat_cmdline == NULL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3464 ResetRedobuff();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3465 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3466 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3467 AppendToRedobuffLit(repeat_cmdline, -1);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3468 AppendToRedobuff(NL_STR);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3469 VIM_CLEAR(repeat_cmdline);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3470 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3471 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3472 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3473
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3474 if (redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3475 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3476 // Redo of an operation on a Visual area. Use the same size from
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3477 // redo_VIsual_line_count and redo_VIsual_vcol.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3478 oap->start = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3479 curwin->w_cursor.lnum += redo_VIsual_line_count - 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3480 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3481 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3482 VIsual_mode = redo_VIsual_mode;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3483 if (redo_VIsual_vcol == MAXCOL || VIsual_mode == 'v')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3484 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3485 if (VIsual_mode == 'v')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3486 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3487 if (redo_VIsual_line_count <= 1)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3488 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3489 validate_virtcol();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3490 curwin->w_curswant =
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3491 curwin->w_virtcol + redo_VIsual_vcol - 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3492 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3493 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3494 curwin->w_curswant = redo_VIsual_vcol;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3495 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3496 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3497 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3498 curwin->w_curswant = MAXCOL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3499 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3500 coladvance(curwin->w_curswant);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3501 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3502 cap->count0 = redo_VIsual_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3503 if (redo_VIsual_count != 0)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3504 cap->count1 = redo_VIsual_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3505 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3506 cap->count1 = 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3507 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3508 else if (VIsual_active)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3509 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3510 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3511 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3512 // Save the current VIsual area for '< and '> marks, and "gv"
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3513 curbuf->b_visual.vi_start = VIsual;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3514 curbuf->b_visual.vi_end = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3515 curbuf->b_visual.vi_mode = VIsual_mode;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3516 restore_visual_mode();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3517 curbuf->b_visual.vi_curswant = curwin->w_curswant;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3518 # ifdef FEAT_EVAL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3519 curbuf->b_visual_mode_eval = VIsual_mode;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3520 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3521 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3522
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3523 // In Select mode, a linewise selection is operated upon like a
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3524 // characterwise selection.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3525 // Special case: gH<Del> deletes the last line.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3526 if (VIsual_select && VIsual_mode == 'V'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3527 && cap->oap->op_type != OP_DELETE)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3528 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3529 if (LT_POS(VIsual, curwin->w_cursor))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3530 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3531 VIsual.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3532 curwin->w_cursor.col =
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3533 (colnr_T)STRLEN(ml_get(curwin->w_cursor.lnum));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3534 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3535 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3536 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3537 curwin->w_cursor.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3538 VIsual.col = (colnr_T)STRLEN(ml_get(VIsual.lnum));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3539 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3540 VIsual_mode = 'v';
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3541 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3542 // If 'selection' is "exclusive", backup one character for
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3543 // charwise selections.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3544 else if (VIsual_mode == 'v')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3545 include_line_break = unadjust_for_sel();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3546
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3547 oap->start = VIsual;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3548 if (VIsual_mode == 'V')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3549 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3550 oap->start.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3551 oap->start.coladd = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3552 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3553 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3554
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3555 // Set oap->start to the first position of the operated text, oap->end
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3556 // to the end of the operated text. w_cursor is equal to oap->start.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3557 if (LT_POS(oap->start, curwin->w_cursor))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3558 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3559 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3560 // Include folded lines completely.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3561 if (!VIsual_active)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3562 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3563 if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3564 oap->start.col = 0;
18882
f9e41ffd3539 patch 8.2.0002: "dj" only deletes first line of closed fold
Bram Moolenaar <Bram@vim.org>
parents: 18808
diff changeset
3565 if ((curwin->w_cursor.col > 0 || oap->inclusive
f9e41ffd3539 patch 8.2.0002: "dj" only deletes first line of closed fold
Bram Moolenaar <Bram@vim.org>
parents: 18808
diff changeset
3566 || oap->motion_type == MLINE)
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3567 && hasFolding(curwin->w_cursor.lnum, NULL,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3568 &curwin->w_cursor.lnum))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3569 curwin->w_cursor.col = (colnr_T)STRLEN(ml_get_curline());
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3570 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3571 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3572 oap->end = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3573 curwin->w_cursor = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3574
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3575 // w_virtcol may have been updated; if the cursor goes back to its
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3576 // previous position w_virtcol becomes invalid and isn't updated
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3577 // automatically.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3578 curwin->w_valid &= ~VALID_VIRTCOL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3579 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3580 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3581 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3582 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3583 // Include folded lines completely.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3584 if (!VIsual_active && oap->motion_type == MLINE)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3585 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3586 if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3587 NULL))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3588 curwin->w_cursor.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3589 if (hasFolding(oap->start.lnum, NULL, &oap->start.lnum))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3590 oap->start.col = (colnr_T)STRLEN(ml_get(oap->start.lnum));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3591 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3592 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3593 oap->end = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3594 oap->start = curwin->w_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3595 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3596
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3597 // Just in case lines were deleted that make the position invalid.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3598 check_pos(curwin->w_buffer, &oap->end);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3599 oap->line_count = oap->end.lnum - oap->start.lnum + 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3600
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3601 // Set "virtual_op" before resetting VIsual_active.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3602 virtual_op = virtual_active();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3603
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3604 if (VIsual_active || redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3605 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3606 get_op_vcol(oap, redo_VIsual_vcol, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3607
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3608 if (!redo_VIsual_busy && !gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3609 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3610 // Prepare to reselect and redo Visual: this is based on the
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3611 // size of the Visual text
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3612 resel_VIsual_mode = VIsual_mode;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3613 if (curwin->w_curswant == MAXCOL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3614 resel_VIsual_vcol = MAXCOL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3615 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3616 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3617 if (VIsual_mode != Ctrl_V)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3618 getvvcol(curwin, &(oap->end),
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3619 NULL, NULL, &oap->end_vcol);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3620 if (VIsual_mode == Ctrl_V || oap->line_count <= 1)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3621 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3622 if (VIsual_mode != Ctrl_V)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3623 getvvcol(curwin, &(oap->start),
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3624 &oap->start_vcol, NULL, NULL);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3625 resel_VIsual_vcol = oap->end_vcol - oap->start_vcol + 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3626 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3627 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3628 resel_VIsual_vcol = oap->end_vcol;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3629 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3630 resel_VIsual_line_count = oap->line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3631 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3632
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3633 // can't redo yank (unless 'y' is in 'cpoptions') and ":"
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3634 if ((redo_yank || oap->op_type != OP_YANK)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3635 && oap->op_type != OP_COLON
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3636 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3637 && oap->op_type != OP_FOLD
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3638 && oap->op_type != OP_FOLDOPEN
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3639 && oap->op_type != OP_FOLDOPENREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3640 && oap->op_type != OP_FOLDCLOSE
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3641 && oap->op_type != OP_FOLDCLOSEREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3642 && oap->op_type != OP_FOLDDEL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3643 && oap->op_type != OP_FOLDDELREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3644 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3645 && oap->motion_force == NUL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3646 )
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3647 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3648 // Prepare for redoing. Only use the nchar field for "r",
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3649 // otherwise it might be the second char of the operator.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3650 if (cap->cmdchar == 'g' && (cap->nchar == 'n'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3651 || cap->nchar == 'N'))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3652 prep_redo(oap->regname, cap->count0,
18808
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3653 get_op_char(oap->op_type),
7982f65d8f54 patch 8.1.2392: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
3654 get_extra_op_char(oap->op_type),
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3655 oap->motion_force, cap->cmdchar, cap->nchar);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3656 else if (cap->cmdchar != ':')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3657 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3658 int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3659
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3660 // reverse what nv_replace() did
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3661 if (nchar == REPLACE_CR_NCHAR)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3662 nchar = CAR;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3663 else if (nchar == REPLACE_NL_NCHAR)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3664 nchar = NL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3665 prep_redo(oap->regname, 0L, NUL, 'v',
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3666 get_op_char(oap->op_type),
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3667 get_extra_op_char(oap->op_type),
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3668 nchar);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3669 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3670 if (!redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3671 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3672 redo_VIsual_mode = resel_VIsual_mode;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3673 redo_VIsual_vcol = resel_VIsual_vcol;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3674 redo_VIsual_line_count = resel_VIsual_line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3675 redo_VIsual_count = cap->count0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3676 redo_VIsual_arg = cap->arg;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3677 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3678 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3679
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3680 // oap->inclusive defaults to TRUE.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3681 // If oap->end is on a NUL (empty line) oap->inclusive becomes
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3682 // FALSE. This makes "d}P" and "v}dP" work the same.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3683 if (oap->motion_force == NUL || oap->motion_type == MLINE)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3684 oap->inclusive = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3685 if (VIsual_mode == 'V')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3686 oap->motion_type = MLINE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3687 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3688 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3689 oap->motion_type = MCHAR;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3690 if (VIsual_mode != Ctrl_V && *ml_get_pos(&(oap->end)) == NUL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3691 && (include_line_break || !virtual_op))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3692 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3693 oap->inclusive = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3694 // Try to include the newline, unless it's an operator
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3695 // that works on lines only.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3696 if (*p_sel != 'o'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3697 && !op_on_lines(oap->op_type)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3698 && oap->end.lnum < curbuf->b_ml.ml_line_count)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3699 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3700 ++oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3701 oap->end.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3702 oap->end.coladd = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3703 ++oap->line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3704 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3705 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3706 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3707
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3708 redo_VIsual_busy = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3709
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3710 // Switch Visual off now, so screen updating does
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3711 // not show inverted text when the screen is redrawn.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3712 // With OP_YANK and sometimes with OP_COLON and OP_FILTER there is
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3713 // no screen redraw, so it is done here to remove the inverted
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3714 // part.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3715 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3716 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3717 VIsual_active = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3718 setmouse();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3719 mouse_dragging = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3720 may_clear_cmdline();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3721 if ((oap->op_type == OP_YANK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3722 || oap->op_type == OP_COLON
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3723 || oap->op_type == OP_FUNCTION
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3724 || oap->op_type == OP_FILTER)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3725 && oap->motion_force == NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3726 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3727 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3728 // make sure redrawing is correct
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3729 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3730 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3731 redraw_curbuf_later(INVERTED);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3732 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3733 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3734 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3735
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3736 // Include the trailing byte of a multi-byte char.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3737 if (has_mbyte && oap->inclusive)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3738 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3739 int l;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3740
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3741 l = (*mb_ptr2len)(ml_get_pos(&oap->end));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3742 if (l > 1)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3743 oap->end.col += l - 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3744 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3745 curwin->w_set_curswant = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3746
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3747 // oap->empty is set when start and end are the same. The inclusive
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3748 // flag affects this too, unless yanking and the end is on a NUL.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3749 oap->empty = (oap->motion_type == MCHAR
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3750 && (!oap->inclusive
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3751 || (oap->op_type == OP_YANK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3752 && gchar_pos(&oap->end) == NUL))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3753 && EQUAL_POS(oap->start, oap->end)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3754 && !(virtual_op && oap->start.coladd != oap->end.coladd));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3755 // For delete, change and yank, it's an error to operate on an
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3756 // empty region, when 'E' included in 'cpoptions' (Vi compatible).
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3757 empty_region_error = (oap->empty
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3758 && vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3759
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3760 // Force a redraw when operating on an empty Visual region, when
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3761 // 'modifiable is off or creating a fold.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3762 if (oap->is_VIsual && (oap->empty || !curbuf->b_p_ma
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3763 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3764 || oap->op_type == OP_FOLD
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3765 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3766 ))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3767 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3768 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3769 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3770 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3771 redraw_curbuf_later(INVERTED);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3772 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3773
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3774 // If the end of an operator is in column one while oap->motion_type
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3775 // is MCHAR and oap->inclusive is FALSE, we put op_end after the last
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3776 // character in the previous line. If op_start is on or before the
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3777 // first non-blank in the line, the operator becomes linewise
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3778 // (strange, but that's the way vi does it).
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3779 if ( oap->motion_type == MCHAR
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3780 && oap->inclusive == FALSE
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3781 && !(cap->retval & CA_NO_ADJ_OP_END)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3782 && oap->end.col == 0
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3783 && (!oap->is_VIsual || *p_sel == 'o')
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3784 && !oap->block_mode
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3785 && oap->line_count > 1)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3786 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3787 oap->end_adjusted = TRUE; // remember that we did this
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3788 --oap->line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3789 --oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3790 if (inindent(0))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3791 oap->motion_type = MLINE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3792 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3793 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3794 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3795 if (oap->end.col)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3796 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3797 --oap->end.col;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3798 oap->inclusive = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3799 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3800 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3801 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3802 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3803 oap->end_adjusted = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3804
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3805 switch (oap->op_type)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3806 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3807 case OP_LSHIFT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3808 case OP_RSHIFT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3809 op_shift(oap, TRUE, oap->is_VIsual ? (int)cap->count1 : 1);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3810 auto_format(FALSE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3811 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3812
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3813 case OP_JOIN_NS:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3814 case OP_JOIN:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3815 if (oap->line_count < 2)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3816 oap->line_count = 2;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3817 if (curwin->w_cursor.lnum + oap->line_count - 1 >
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3818 curbuf->b_ml.ml_line_count)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3819 beep_flush();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3820 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3821 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3822 (void)do_join(oap->line_count, oap->op_type == OP_JOIN,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3823 TRUE, TRUE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3824 auto_format(FALSE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3825 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3826 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3827
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3828 case OP_DELETE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3829 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3830 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3831 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3832 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3833 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3834 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3835 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3836 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3837 (void)op_delete(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3838 if (oap->motion_type == MLINE && has_format_option(FO_AUTO))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3839 u_save_cursor(); // cursor line wasn't saved yet
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3840 auto_format(FALSE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3841 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3842 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3843
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3844 case OP_YANK:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3845 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3846 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3847 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3848 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3849 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3850 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3851 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3852 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3853 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3854 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3855 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3856 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3857 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3858 (void)op_yank(oap, FALSE, !gui_yank);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3859 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3860 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3861 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3862
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3863 case OP_CHANGE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3864 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3865 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3866 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3867 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3868 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3869 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3870 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3871 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3872 // This is a new edit command, not a restart. Need to
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3873 // remember it to make 'insertmode' work with mappings for
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3874 // Visual mode. But do this only once and not when typed and
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3875 // 'insertmode' isn't set.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3876 if (p_im || !KeyTyped)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3877 restart_edit_save = restart_edit;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3878 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3879 restart_edit_save = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3880 restart_edit = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3881 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3882 // Restore linebreak, so that when the user edits it looks as
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3883 // before.
19176
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
3884 curwin->w_p_lbr = lbr_saved;
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3885 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3886 // Reset finish_op now, don't want it set inside edit().
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3887 finish_op = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3888 if (op_change(oap)) // will call edit()
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3889 cap->retval |= CA_COMMAND_BUSY;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3890 if (restart_edit == 0)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3891 restart_edit = restart_edit_save;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3892 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3893 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3894
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3895 case OP_FILTER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3896 if (vim_strchr(p_cpo, CPO_FILTER) != NULL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3897 AppendToRedobuff((char_u *)"!\r"); // use any last used !cmd
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3898 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3899 bangredo = TRUE; // do_bang() will put cmd in redo buffer
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3900 // FALLTHROUGH
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3901
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3902 case OP_INDENT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3903 case OP_COLON:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3904
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3905 #if defined(FEAT_LISP) || defined(FEAT_CINDENT)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3906 // If 'equalprg' is empty, do the indenting internally.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3907 if (oap->op_type == OP_INDENT && *get_equalprg() == NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3908 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3909 # ifdef FEAT_LISP
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3910 if (curbuf->b_p_lisp)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3911 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3912 op_reindent(oap, get_lisp_indent);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3913 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3914 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3915 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3916 # ifdef FEAT_CINDENT
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3917 op_reindent(oap,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3918 # ifdef FEAT_EVAL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3919 *curbuf->b_p_inde != NUL ? get_expr_indent :
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3920 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3921 get_c_indent);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3922 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3923 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3924 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3925 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3926
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3927 op_colon(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3928 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3929
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3930 case OP_TILDE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3931 case OP_UPPER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3932 case OP_LOWER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3933 case OP_ROT13:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3934 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3935 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3936 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3937 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3938 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3939 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3940 op_tilde(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3941 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3942 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3943
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3944 case OP_FORMAT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3945 #if defined(FEAT_EVAL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3946 if (*curbuf->b_p_fex != NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3947 op_formatexpr(oap); // use expression
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3948 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3949 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3950 if (*p_fp != NUL || *curbuf->b_p_fp != NUL)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3951 op_colon(oap); // use external command
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3952 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3953 op_format(oap, FALSE); // use internal function
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3954 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3955
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3956 case OP_FORMAT2:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3957 op_format(oap, TRUE); // use internal function
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3958 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3959
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3960 case OP_FUNCTION:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3961 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3962 // Restore linebreak, so that when the user edits it looks as
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3963 // before.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3964 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3965 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3966 op_function(oap); // call 'operatorfunc'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3967 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3968
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3969 case OP_INSERT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3970 case OP_APPEND:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3971 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3972 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3973 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3974 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3975 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3976 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3977 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3978 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3979 // This is a new edit command, not a restart. Need to
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3980 // remember it to make 'insertmode' work with mappings for
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3981 // Visual mode. But do this only once.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3982 restart_edit_save = restart_edit;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3983 restart_edit = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3984 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3985 // Restore linebreak, so that when the user edits it looks as
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3986 // before.
19176
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
3987 curwin->w_p_lbr = lbr_saved;
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3988 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3989 op_insert(oap, cap->count1);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3990 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3991 // Reset linebreak, so that formatting works correctly.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3992 curwin->w_p_lbr = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3993 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3994
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3995 // TODO: when inserting in several lines, should format all
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3996 // the lines.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3997 auto_format(FALSE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3998
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
3999 if (restart_edit == 0)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4000 restart_edit = restart_edit_save;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4001 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4002 cap->retval |= CA_COMMAND_BUSY;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4003 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4004 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4005
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4006 case OP_REPLACE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4007 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4008 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4009 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4010 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4011 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4012 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4013 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4014 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4015 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4016 // Restore linebreak, so that when the user edits it looks as
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4017 // before.
19176
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents: 19005
diff changeset
4018 curwin->w_p_lbr = lbr_saved;
18219
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4019 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4020 op_replace(oap, cap->nchar);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4021 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4022 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4023
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4024 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4025 case OP_FOLD:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4026 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4027 foldCreate(oap->start.lnum, oap->end.lnum);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4028 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4029
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4030 case OP_FOLDOPEN:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4031 case OP_FOLDOPENREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4032 case OP_FOLDCLOSE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4033 case OP_FOLDCLOSEREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4034 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4035 opFoldRange(oap->start.lnum, oap->end.lnum,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4036 oap->op_type == OP_FOLDOPEN
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4037 || oap->op_type == OP_FOLDOPENREC,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4038 oap->op_type == OP_FOLDOPENREC
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4039 || oap->op_type == OP_FOLDCLOSEREC,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4040 oap->is_VIsual);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4041 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4042
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4043 case OP_FOLDDEL:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4044 case OP_FOLDDELREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4045 VIsual_reselect = FALSE; // don't reselect now
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4046 deleteFold(oap->start.lnum, oap->end.lnum,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4047 oap->op_type == OP_FOLDDELREC, oap->is_VIsual);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4048 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4049 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4050 case OP_NR_ADD:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4051 case OP_NR_SUB:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4052 if (empty_region_error)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4053 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4054 vim_beep(BO_OPER);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4055 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4056 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4057 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4058 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4059 VIsual_active = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4060 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4061 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4062 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4063 op_addsub(oap, cap->count1, redo_VIsual_arg);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4064 VIsual_active = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4065 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4066 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4067 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4068 default:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4069 clearopbeep(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4070 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4071 virtual_op = MAYBE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4072 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4073 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4074 // if 'sol' not set, go back to old column for some commands
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4075 if (!p_sol && oap->motion_type == MLINE && !oap->end_adjusted
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4076 && (oap->op_type == OP_LSHIFT || oap->op_type == OP_RSHIFT
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4077 || oap->op_type == OP_DELETE))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4078 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4079 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4080 curwin->w_p_lbr = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4081 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4082 coladvance(curwin->w_curswant = old_col);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4083 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4084 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4085 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4086 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4087 curwin->w_cursor = old_cursor;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4088 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4089 oap->block_mode = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4090 clearop(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4091 motion_force = NUL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4092 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4093 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4094 curwin->w_p_lbr = lbr_saved;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4095 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
4096 }