vim: src/ops.c annotate

annotate src/ops.c @ 28773:d770568e6c98 v8.2.4911

patch 8.2.4911: the mode #defines are not clearly named Commit: https://github.com/vim/vim/commit/249591057b4840785c50e41dd850efb8a8faf435 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 7 20:01:16 2022 +0100 patch 8.2.4911: the mode #defines are not clearly named Problem: The mode #defines are not clearly named. Solution: Prepend MODE_. Renumber them to put the mapped modes first.

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 07 May 2022 21:15:06 +0200
parents	bef82285dda0
children	d0241e74bfdb

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,
23287 f2a70fca3485 patch 8.2.2189: cannot repeat a command that uses the small delete register Bram Moolenaar <Bram@vim.org> parents: 23281 diff changeset	12 * op_change, op_yank, do_join
7 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;
24866 f1121eb17e14 patch 8.2.2971: cannot yank a block without trailing spaces Bram Moolenaar <Bram@vim.org> parents: 24768 diff changeset	81 if (char1 == 'z' && char2 == 'y') // OP_YANK
f1121eb17e14 patch 8.2.2971: cannot yank a block without trailing spaces Bram Moolenaar <Bram@vim.org> parents: 24768 diff changeset	82 return OP_YANK;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	83 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	84 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	85 if (opchars[i][0] == char1 && opchars[i][1] == char2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	86 break;
24768 7334bf933510 patch 8.2.2922: computing array length is done in various ways Bram Moolenaar <Bram@vim.org> parents: 24756 diff changeset	87 if (i == (int)ARRAY_LENGTH(opchars) - 1)
13072 50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W : Christian Brabandt <cb@256bit.org> parents: 13047 diff changeset	88 {
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W : Christian Brabandt <cb@256bit.org> parents: 13047 diff changeset	89 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	90 break;
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W : Christian Brabandt <cb@256bit.org> parents: 13047 diff changeset	91 }
50aa6da392ce patch 8.0.1411: reading invalid memory with CTRL-W : Christian Brabandt <cb@256bit.org> parents: 13047 diff changeset	92 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	93 return i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	94 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	95
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	96 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	97 * Return TRUE if operator "op" always works on whole lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	98 */
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	99 static int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	100 op_on_lines(int op)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	101 {
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	102 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	103 }
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
15555 d89c5b339c2a patch 8.1.0785: depending on the configuration some functions are unused Bram Moolenaar <Bram@vim.org> parents: 15543 diff changeset	105 #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	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 * 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	108 */
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 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	110 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	111 {
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 14004 diff changeset	112 return opchars[op][2] & OPF_CHANGE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	113 }
15555 d89c5b339c2a patch 8.1.0785: depending on the configuration some functions are unused Bram Moolenaar <Bram@vim.org> parents: 15543 diff changeset	114 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	115
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	116 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	117 * Get first operator command character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	118 * Returns 'g' or 'z' if there is another command character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	119 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	120 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	121 get_op_char(int optype)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	122 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	123 return opchars[optype][0];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	124 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	125
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	126 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	127 * Get second operator command character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	128 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	129 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	130 get_extra_op_char(int optype)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	131 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	132 return opchars[optype][1];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	133 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	134
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	135 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	136 * op_shift - handle a shift operation
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	137 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	138 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	139 op_shift(oparg_T *oap, int curs_top, int amount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	140 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	141 long i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	142 int first_char;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	143 int block_col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	144
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	145 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	146 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	147 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	148
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	149 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	150 block_col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	151
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	152 for (i = oap->line_count; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	153 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	154 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	155 if (first_char == NUL) // empty line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	156 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	157 else if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	158 shift_block(oap, amount);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	159 else
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	160 // 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	161 // isn't set or 'cindent' isn't set or '#' isn't in 'cino'.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	162 #if defined(FEAT_SMARTINDENT) \|\| defined(FEAT_CINDENT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	163 if (first_char != '#' \|\| !preprocs_left())
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	164 #endif
1516 ee9d2d24ea9b updated for version 7.1-231 vimboss parents: 1477 diff changeset	165 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	166 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	167 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	168
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	169 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	170 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	171 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	172 curwin->w_cursor.lnum = oap->start.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	173 curwin->w_cursor.col = block_col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	174 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	175 else if (curs_top) // put cursor on first line, for ">>"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	176 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	177 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	178 beginline(BL_SOL \| BL_FIX); // shift_line() may have set cursor.col
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	179 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	180 else
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	181 --curwin->w_cursor.lnum; // put cursor on last line, for ":>"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	182
10486 99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f Christian Brabandt <cb@256bit.org> parents: 10104 diff changeset	183 #ifdef FEAT_FOLDING
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	184 // 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	185 foldOpenCursor();
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f Christian Brabandt <cb@256bit.org> parents: 10104 diff changeset	186 #endif
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f Christian Brabandt <cb@256bit.org> parents: 10104 diff changeset	187
99896ee0cac5 commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f Christian Brabandt <cb@256bit.org> parents: 10104 diff changeset	188
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	189 if (oap->line_count > p_report)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	190 {
14585 c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	191 char *op;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	192 char *msg_line_single;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	193 char *msg_line_plural;
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	194
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	195 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	196 op = ">";
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	197 else
14585 c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	198 op = "<";
c8f07e8b273e patch 8.1.0306: plural messages are not translated properly Christian Brabandt <cb@256bit.org> parents: 14424 diff changeset	199 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	200 "%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	201 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	202 "%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	203 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	204 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	205 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	206 msg_attr_keep((char *)IObuff, 0, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	207 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	208
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	209 if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	210 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	211 // Set "'[" and "']" marks.
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	212 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	213 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	214 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	215 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	216 --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	217 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	218 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	219
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	220 /*
15422 b55b89692fd2 patch 8.1.0719: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 15326 diff changeset	221 * 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	222 * leaves cursor on first blank in the line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	223 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	224 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	225 shift_line(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	226 int left,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	227 int round,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	228 int amount,
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	229 int call_changed_bytes) // call changed_bytes()
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	230 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	231 int count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	232 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	233 int sw_val = (int)get_sw_value_indent(curbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	234
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	235 count = get_indent(); // get current indent
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	236
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	237 if (round) // round off indent
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	238 {
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	239 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	240 j = count % sw_val; // extra spaces
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	241 if (j && left) // first remove extra spaces
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	242 --amount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	243 if (left)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	244 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	245 i -= amount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	246 if (i < 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	247 i = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	248 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	249 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	250 i += amount;
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	251 count = i * sw_val;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	252 }
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	253 else // original vi indent
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	254 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	255 if (left)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	256 {
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	257 count -= sw_val * amount;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	258 if (count < 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	259 count = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	260 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	261 else
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	262 count += sw_val * amount;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	263 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	264
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18164 diff changeset	265 // Set new indent
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	266 if (State & VREPLACE_FLAG)
1516 ee9d2d24ea9b updated for version 7.1-231 vimboss parents: 1477 diff changeset	267 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	268 else
1516 ee9d2d24ea9b updated for version 7.1-231 vimboss parents: 1477 diff changeset	269 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	270 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	271
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	272 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	273 * Shift one line of the current block one shiftwidth right or left.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	274 * Leaves cursor on first character in block.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	275 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	276 static void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	277 shift_block(oparg_T *oap, int amount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	278 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	279 int left = (oap->op_type == OP_LSHIFT);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	280 int oldstate = State;
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	281 int total;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	282 char_u newp, oldp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	283 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	284 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	285 int ts_val = (int)curbuf->b_p_ts;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	286 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	287 int incr;
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	288 colnr_T ws_vcol;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	289 int i = 0, j = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	290 int len;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	291 #ifdef FEAT_RIGHTLEFT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	292 int old_p_ri = p_ri;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	293
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	294 p_ri = 0; // don't want revins in indent
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	295 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	296
28773 d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named Bram Moolenaar <Bram@vim.org> parents: 28169 diff changeset	297 State = MODE_INSERT; // don't want MODE_REPLACE for State
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	298 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	299 if (bd.is_short)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	300 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	301
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	302 // 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	303 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	304 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	305 return; // multiplication overflow
11997 66b677c77467 patch 8.0.0879: crash when shifting with huge number Christian Brabandt <cb@256bit.org> parents: 11688 diff changeset	306
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	307 oldp = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	308
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	309 if (!left)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	310 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	311 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	312 * 1. Get start vcol
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	313 * 2. Total ws vcols
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	314 * 3. Divvy into TABs & spp
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	315 * 4. Construct new string
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	316 */
19195 2ef19eed524a patch 8.2.0156: various typos in source files and tests Bram Moolenaar <Bram@vim.org> parents: 19176 diff changeset	317 total += bd.pre_whitesp; // all virtual WS up to & incl a split TAB
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	318 ws_vcol = bd.start_vcol - bd.pre_whitesp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	319 if (bd.startspaces)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	320 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	321 if (has_mbyte)
8399 7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	322 {
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	323 if ((*mb_ptr2len)(bd.textstart) == 1)
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	324 ++bd.textstart;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	325 else
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	326 {
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	327 ws_vcol = 0;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	328 bd.startspaces = 0;
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	329 }
7d1c42e3ce11 commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125 Christian Brabandt <cb@256bit.org> parents: 7829 diff changeset	330 }
1995 92809ecb9a47 updated for version 7.2-292 vimboss parents: 1982 diff changeset	331 else
92809ecb9a47 updated for version 7.2-292 vimboss parents: 1982 diff changeset	332 ++bd.textstart;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	333 }
11129 f4ea50924c6d patch 8.0.0452: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11127 diff changeset	334 for ( ; VIM_ISWHITE(*bd.textstart); )
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	335 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	336 // TODO: is passing bd.textstart for start of the line OK?
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	337 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, bd.start_vcol);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	338 total += incr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	339 bd.start_vcol += incr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	340 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	341 // 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	342 // 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	343 #ifdef FEAT_VARTABS
2ad722003b36 patch 8.1.0105: all tab stops are the same Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	344 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	345 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	346 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	347 else
2ad722003b36 patch 8.1.0105: all tab stops are the same Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	348 j = total;
2ad722003b36 patch 8.1.0105: all tab stops are the same Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	349 #else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	350 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	351 i = ((ws_vcol % ts_val) + total) / ts_val; // number of tabs
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	352 if (i)
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	353 j = ((ws_vcol % ts_val) + total) % ts_val; // number of spp
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	354 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	355 j = total;
14175 2ad722003b36 patch 8.1.0105: all tab stops are the same Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	356 #endif
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	357 // if we're splitting a TAB, allow for it
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	358 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	359 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	360 newp = alloc(bd.textcol + i + j + len);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	361 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	362 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	363 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	364 mch_memmove(newp, oldp, (size_t)bd.textcol);
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	365 vim_memset(newp + bd.textcol, TAB, (size_t)i);
e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	366 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	367 // the end
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	368 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	369 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	370 else // left
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	371 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	372 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	373 // be shifted
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	374 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	375 // copied verbatim
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	376 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	377 // of line
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	378 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	379 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	380 // block shift
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	381 size_t block_space_width;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	382 size_t shift_amount;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	383 char_u *non_white = bd.textstart;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	384 colnr_T non_white_col;
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 /*
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	387 * Firstly, let's find the first non-whitespace character that is
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	388 * displayed after the block's start column and the character's column
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	389 * number. Also, let's calculate the width of all the whitespace
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	390 * characters that are displayed in the block and precede the searched
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	391 * non-whitespace character.
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	392 */
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	393
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	394 // 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	395 // 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	396 // searching from the next character.
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	397 if (bd.startspaces)
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	398 MB_PTR_ADV(non_white);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	399
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	400 // The character's column is in "bd.start_vcol".
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	401 non_white_col = bd.start_vcol;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	402
11129 f4ea50924c6d patch 8.0.0452: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11127 diff changeset	403 while (VIM_ISWHITE(*non_white))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	404 {
5995 ef83b423ebf7 updated for version 7.4.338 Bram Moolenaar <bram@vim.org> parents: 5981 diff changeset	405 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	406 non_white_col += incr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	407 }
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	408
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	409 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	410 // 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	411 shift_amount = (block_space_width < (size_t)total
f765f9c139de updated for version 7.2-158 vimboss parents: 1839 diff changeset	412 ? block_space_width : (size_t)total);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	413
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	414 // The column to which we will shift the text.
1860 f765f9c139de updated for version 7.2-158 vimboss parents: 1839 diff changeset	415 destination_col = (colnr_T)(non_white_col - shift_amount);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	416
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	417 // 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	418 // reuse without modification.
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	419 verbatim_copy_end = bd.textstart;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	420 verbatim_copy_width = bd.start_vcol;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	421
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	422 // 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	423 // 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	424 // column number.
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	425 if (bd.startspaces)
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	426 verbatim_copy_width -= bd.start_char_vcols;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	427 while (verbatim_copy_width < destination_col)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	428 {
5995 ef83b423ebf7 updated for version 7.4.338 Bram Moolenaar <bram@vim.org> parents: 5981 diff changeset	429 char_u *line = verbatim_copy_end;
ef83b423ebf7 updated for version 7.4.338 Bram Moolenaar <bram@vim.org> parents: 5981 diff changeset	430
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	431 // 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	432 incr = lbr_chartabsize(line, verbatim_copy_end,
ef83b423ebf7 updated for version 7.4.338 Bram Moolenaar <bram@vim.org> parents: 5981 diff changeset	433 verbatim_copy_width);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	434 if (verbatim_copy_width + incr > destination_col)
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	435 break;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	436 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	437 MB_PTR_ADV(verbatim_copy_end);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	438 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	439
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	440 // 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	441 // 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	442 // character, which we will have to partly replace with spaces.
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	443 fill = destination_col - verbatim_copy_width;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	444
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	445 // 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	446 // - 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	447 // - "fill" number of spaces,
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	448 // - the rest of the line, pointed to by non_white.
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	449 new_line_len = (unsigned)(verbatim_copy_end - oldp)
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	450 + fill
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	451 + (unsigned)STRLEN(non_white) + 1;
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	452
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16714 diff changeset	453 newp = alloc(new_line_len);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	454 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	455 return;
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	456 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	457 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill);
1839 df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	458 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	459 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	460 // replace the line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	461 ml_replace(curwin->w_cursor.lnum, newp, FALSE);
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	462 changed_bytes(curwin->w_cursor.lnum, bd.textcol);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	463 State = oldstate;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	464 curwin->w_cursor.col = oldcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	465 #ifdef FEAT_RIGHTLEFT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	466 p_ri = old_p_ri;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	467 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	468 }
15422 b55b89692fd2 patch 8.1.0719: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 15326 diff changeset	469
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	470 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	471 * Insert string "s" (b_insert ? before : after) block :AKelly
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	472 * Caller must prepare for undo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	473 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	474 static void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	475 block_insert(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	476 oparg_T *oap,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	477 char_u *s,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	478 int b_insert,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	479 struct block_def *bdp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	480 {
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	481 int ts_val;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	482 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	483 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	484 colnr_T offset; // pointer along new line
22282 5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	485 colnr_T startcol; // column where insert starts
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	486 unsigned s_len; // STRLEN(s)
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	487 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	488 linenr_T lnum; // loop var
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	489 int oldstate = State;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	490
28773 d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named Bram Moolenaar <Bram@vim.org> parents: 28169 diff changeset	491 State = MODE_INSERT; // don't want MODE_REPLACE for State
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	492 s_len = (unsigned)STRLEN(s);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	493
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	494 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	495 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	496 block_prep(oap, bdp, lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	497 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	498 continue; // OP_INSERT, line ends before block start
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	499
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	500 oldp = ml_get(lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	501
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	502 if (b_insert)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	503 {
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	504 ts_val = bdp->start_char_vcols;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	505 spaces = bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	506 if (spaces != 0)
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	507 count = ts_val - 1; // we're cutting a TAB
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	508 offset = bdp->textcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	509 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	510 else // append
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	511 {
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	512 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	513 if (!bdp->is_short) // spaces = padding after block
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	514 {
18100 df5778d73320 patch 8.1.2045: the option.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18062 diff changeset	515 spaces = (bdp->endspaces ? ts_val - bdp->endspaces : 0);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	516 if (spaces != 0)
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	517 count = ts_val - 1; // we're cutting a TAB
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	518 offset = bdp->textcol + bdp->textlen - (spaces != 0);
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 else // spaces = padding to block edge
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	521 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	522 // if $ used, just append to EOL (ie spaces==0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	523 if (!bdp->is_MAX)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	524 spaces = (oap->end_vcol - bdp->end_vcol) + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	525 count = spaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	526 offset = bdp->textcol + bdp->textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	527 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	528 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	529
6140 cb3218a69c2f updated for version 7.4.408 Bram Moolenaar <bram@vim.org> parents: 6116 diff changeset	530 if (has_mbyte && spaces > 0)
27245 776db9e02b61 patch 8.2.4151: reading beyond the end of a line Bram Moolenaar <Bram@vim.org> parents: 27183 diff changeset	531 // avoid copying part of a multi-byte character
776db9e02b61 patch 8.2.4151: reading beyond the end of a line Bram Moolenaar <Bram@vim.org> parents: 27183 diff changeset	532 offset -= (*mb_head_off)(oldp, oldp + offset);
776db9e02b61 patch 8.2.4151: reading beyond the end of a line Bram Moolenaar <Bram@vim.org> parents: 27183 diff changeset	533
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	534 if (spaces < 0) // can happen when the cursor was moved
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	535 spaces = 0;
6140 cb3218a69c2f updated for version 7.4.408 Bram Moolenaar <bram@vim.org> parents: 6116 diff changeset	536
27183 be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	537 // Make sure the allocated size matches what is actually copied below.
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	538 newp = alloc(STRLEN(oldp) + spaces + s_len
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	539 + (spaces > 0 && !bdp->is_short ? ts_val - spaces : 0)
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	540 + count + 1);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	541 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	542 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	543
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	544 // copy up to shifted part
27183 be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	545 mch_memmove(newp, oldp, (size_t)offset);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	546 oldp += offset;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	547
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	548 // insert pre-padding
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	549 vim_memset(newp + offset, ' ', (size_t)spaces);
22282 5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	550 startcol = offset + spaces;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	551
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	552 // copy the new text
22282 5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	553 mch_memmove(newp + startcol, s, (size_t)s_len);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	554 offset += s_len;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	555
27183 be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	556 if (spaces > 0 && !bdp->is_short)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	557 {
27183 be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	558 if (*oldp == TAB)
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	559 {
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	560 // insert post-padding
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	561 vim_memset(newp + offset + spaces, ' ',
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	562 (size_t)(ts_val - spaces));
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	563 // we're splitting a TAB, don't copy it
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	564 oldp++;
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	565 // We allowed for that TAB, remember this now
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	566 count++;
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	567 }
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	568 else
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	569 // Not a TAB, no extra spaces
be5e01f3ee3b patch 8.2.4120: block insert goes over the end of the line Bram Moolenaar <Bram@vim.org> parents: 27140 diff changeset	570 count = spaces;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	571 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	572
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	573 if (spaces > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	574 offset += count;
1622 149d8b46404c updated for version 7.2a vimboss parents: 1563 diff changeset	575 STRMOVE(newp + offset, oldp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	576
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	577 ml_replace(lnum, newp, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	578
22282 5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	579 if (b_insert)
5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	580 // correct any text properties
5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	581 inserted_bytes(lnum, startcol, s_len);
5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 22278 diff changeset	582
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	583 if (lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	584 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	585 // 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	586 // the insert in the first line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	587 curbuf->b_op_end.lnum = oap->end.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	588 curbuf->b_op_end.col = offset;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	589 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	590 } // for all lnum
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	591
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	592 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	593
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	594 State = oldstate;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	595 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	596
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	597 /*
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	598 * Handle a delete operation.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	599 *
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	600 * Return FAIL if undo failed, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	601 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	602 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	603 op_delete(oparg_T *oap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	604 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	605 int n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	606 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	607 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	608 char_u newp, oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	609 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	610 linenr_T old_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	611 int did_yank = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	612
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	613 if (curbuf->b_ml.ml_flags & ML_EMPTY) // nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	614 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	615
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	616 // Nothing to delete, return here. Do prepare undo, for op_change().
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	617 if (oap->empty)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	618 return u_save_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	619
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	620 if (!curbuf->b_p_ma)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	621 {
25064 8f2262c72178 patch 8.2.3069: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 24866 diff changeset	622 emsg(_(e_cannot_make_changes_modifiable_is_off));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	623 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	624 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	625
27263 93d4ee1e6113 patch 8.2.4160: cannot change the register used for Select mode delete Bram Moolenaar <Bram@vim.org> parents: 27245 diff changeset	626 if (VIsual_select && oap->is_VIsual)
93d4ee1e6113 patch 8.2.4160: cannot change the register used for Select mode delete Bram Moolenaar <Bram@vim.org> parents: 27245 diff changeset	627 // use register given with CTRL_R, defaults to zero
93d4ee1e6113 patch 8.2.4160: cannot change the register used for Select mode delete Bram Moolenaar <Bram@vim.org> parents: 27245 diff changeset	628 oap->regname = VIsual_select_reg;
93d4ee1e6113 patch 8.2.4160: cannot change the register used for Select mode delete Bram Moolenaar <Bram@vim.org> parents: 27245 diff changeset	629
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	630 #ifdef FEAT_CLIPBOARD
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	631 adjust_clip_reg(&oap->regname);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	632 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	633
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	634 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	635 mb_adjust_opend(oap);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	636
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	637 /*
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	638 * 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	639 * 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	640 * 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	641 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	642 if ( oap->motion_type == MCHAR
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	643 && !oap->is_VIsual
50 90188be4861f updated for version 7.0028 vimboss parents: 45 diff changeset	644 && !oap->block_mode
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	645 && oap->line_count > 1
3254 2f075595590f updated for version 7.3.396 Bram Moolenaar <bram@vim.org> parents: 3252 diff changeset	646 && oap->motion_force == NUL
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	647 && oap->op_type == OP_DELETE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	648 {
2957 fe6ad3fd8532 updated for version 7.3.251 Bram Moolenaar <bram@vim.org> parents: 2896 diff changeset	649 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	650 if (*ptr != NUL)
fe6ad3fd8532 updated for version 7.3.251 Bram Moolenaar <bram@vim.org> parents: 2896 diff changeset	651 ptr += oap->inclusive;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	652 ptr = skipwhite(ptr);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	653 if (*ptr == NUL && inindent(0))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	654 oap->motion_type = MLINE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	655 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	656
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	657 /*
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	658 * 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	659 * 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	660 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	661 if ( oap->motion_type == MCHAR
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	662 && oap->line_count == 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	663 && oap->op_type == OP_DELETE
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	664 && *ml_get(oap->start.lnum) == NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	665 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	666 /*
446 7472c565592a updated for version 7.0117 vimboss parents: 419 diff changeset	667 * 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	668 * 'cpoptions' (Vi compatible).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	669 */
446 7472c565592a updated for version 7.0117 vimboss parents: 419 diff changeset	670 if (virtual_op)
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	671 // 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	672 // marks as if it happened.
446 7472c565592a updated for version 7.0117 vimboss parents: 419 diff changeset	673 goto setmarks;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	674 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	675 beep_flush();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	676 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	677 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	678
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	679 /*
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	680 * 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	681 * 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	682 * 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	683 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	684 if (oap->regname != '_')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	685 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	686 if (oap->regname != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	687 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	688 // check for read-only register
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	689 if (!valid_yank_reg(oap->regname, TRUE))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	690 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	691 beep_flush();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	692 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	693 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	694 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	695 if (op_yank(oap, TRUE, FALSE) == OK) // yank without message
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	696 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	697 }
25808 b1440083f0da patch 8.2.3439: deleted lines go to wrong yank register Bram Moolenaar <Bram@vim.org> parents: 25666 diff changeset	698 else
b1440083f0da patch 8.2.3439: deleted lines go to wrong yank register Bram Moolenaar <Bram@vim.org> parents: 25666 diff changeset	699 reset_y_append(); // not appending to unnamed register
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	700
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	701 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	702 * 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	703 * 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	704 * compatible)
3782 063765c3cebb updated for version 7.3.649 Bram Moolenaar <bram@vim.org> parents: 3740 diff changeset	705 * 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	706 * changed it.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	707 */
15987 29de75f53b1a patch 8.1.0999: use register one too often and not properly tested Bram Moolenaar <Bram@vim.org> parents: 15967 diff changeset	708 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	709 \|\| oap->use_reg_one)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	710 {
10827 e366b968bf08 patch 8.0.0303: bracketed paste does not work in Visual mode Christian Brabandt <cb@256bit.org> parents: 10803 diff changeset	711 shift_delete_registers();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	712 if (op_yank(oap, TRUE, FALSE) == OK)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	713 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	714 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	715
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	716 // 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	717 // and the delete is within one line.
3468 b1a42d2522fb updated for version 7.3.498 Bram Moolenaar <bram@vim.org> parents: 3421 diff changeset	718 if ((
b1a42d2522fb updated for version 7.3.498 Bram Moolenaar <bram@vim.org> parents: 3421 diff changeset	719 #ifdef FEAT_CLIPBOARD
3584 443c50cd3e88 updated for version 7.3.552 Bram Moolenaar <bram@vim.org> parents: 3580 diff changeset	720 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') \|\|
443c50cd3e88 updated for version 7.3.552 Bram Moolenaar <bram@vim.org> parents: 3580 diff changeset	721 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') \|\|
3468 b1a42d2522fb updated for version 7.3.498 Bram Moolenaar <bram@vim.org> parents: 3421 diff changeset	722 #endif
b1a42d2522fb updated for version 7.3.498 Bram Moolenaar <bram@vim.org> parents: 3421 diff changeset	723 oap->regname == 0) && oap->motion_type != MLINE
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	724 && oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	725 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	726 oap->regname = '-';
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	727 get_yank_register(oap->regname, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	728 if (op_yank(oap, TRUE, FALSE) == OK)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	729 did_yank = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	730 oap->regname = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	731 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	732
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	733 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	734 * 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	735 * confirmation before doing the delete. This is crude, but simple.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	736 * 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	737 * want.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	738 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	739 if (!did_yank)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	740 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	741 int msg_silent_save = msg_silent;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	742
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	743 msg_silent = 0; // must display the prompt
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	744 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	745 msg_silent = msg_silent_save;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	746 if (n != 'y')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	747 {
26865 bce848ec8b1b patch 8.2.3961: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26581 diff changeset	748 emsg(_(e_command_aborted));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	749 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	750 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	751 }
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 12996 diff changeset	752
13380 69517d67421f patch 8.0.1564: too many #ifdefs Christian Brabandt <cb@256bit.org> parents: 13254 diff changeset	753 #if defined(FEAT_EVAL)
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 12996 diff changeset	754 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	755 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	756 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	757 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	758
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	759 /*
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2278 diff changeset	760 * 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	761 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	762 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	763 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	764 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	765 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	766 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	767
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	768 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	769 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	770 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	771 if (bd.textlen == 0) // nothing to delete
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	772 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	773
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	774 // Adjust cursor position for tab replaced by spaces and 'lbr'.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	775 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	776 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	777 curwin->w_cursor.col = bd.textcol + bd.startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	778 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	779 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	780
16682 7847d281cbbf patch 8.1.1343: text properties not adjusted for Visual block mode delete Bram Moolenaar <Bram@vim.org> parents: 16680 diff changeset	781 // "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	782 // 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	783 // Thus the number of characters may increase!
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	784 n = bd.textlen - bd.startspaces - bd.endspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	785 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	786 newp = alloc(STRLEN(oldp) + 1 - n);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	787 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	788 continue;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	789 // copy up to deleted part
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	790 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	791 // insert spaces
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	792 vim_memset(newp + bd.textcol, ' ',
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	793 (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	794 // copy the part after the deleted part
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	795 oldp += bd.textcol + bd.textlen;
1622 149d8b46404c updated for version 7.2a vimboss parents: 1563 diff changeset	796 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	797 // replace the line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	798 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	799
18763 49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	800 #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	801 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	802 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	803 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	804 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	805
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	806 check_cursor_col();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	807 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	808 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	809 oap->line_count = 0; // no lines deleted
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	810 }
5735 50dbef5e774a updated for version 7.4.212 Bram Moolenaar <bram@vim.org> parents: 5730 diff changeset	811 else if (oap->motion_type == MLINE)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	812 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	813 if (oap->op_type == OP_CHANGE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	814 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	815 // 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	816 // 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	817 // last line is deleted it may be changed.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	818 if (oap->line_count > 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	819 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	820 lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	821 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	822 del_lines((long)(oap->line_count - 1), TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	823 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	824 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	825 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	826 return FAIL;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	827 if (curbuf->b_p_ai) // don't delete indent
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	828 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	829 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	830 did_ai = TRUE; // delete the indent when ESC hit
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	831 ai_col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	832 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	833 else
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	834 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	835 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	836 // leave cursor past last char in line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	837 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	838 u_clearline(); // "U" command not possible after "2cc"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	839 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	840 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	841 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	842 del_lines(oap->line_count, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	843 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	844 u_clearline(); // "U" command not possible after "dd"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	845 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	846 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	847 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	848 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	849 if (virtual_op)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	850 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	851 int endcol = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	852
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	853 // For virtualedit: break the tabs that are partly included.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	854 if (gchar_pos(&oap->start) == '\t')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	855 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	856 if (u_save_cursor() == FAIL) // save first line for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	857 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	858 if (oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	859 endcol = getviscol2(oap->end.col, oap->end.coladd);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	860 coladvance_force(getviscol2(oap->start.col, oap->start.coladd));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	861 oap->start = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	862 if (oap->line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	863 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	864 coladvance(endcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	865 oap->end.col = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	866 oap->end.coladd = curwin->w_cursor.coladd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	867 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	868 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	869 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	870
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	871 // Break a tab only when it's included in the area.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	872 if (gchar_pos(&oap->end) == '\t'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	873 && (int)oap->end.coladd < oap->inclusive)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	874 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	875 // save last line for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	876 if (u_save((linenr_T)(oap->end.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	877 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	878 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	879 curwin->w_cursor = oap->end;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	880 coladvance_force(getviscol2(oap->end.col, oap->end.coladd));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	881 oap->end = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	882 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	883 }
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	884 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	885 mb_adjust_opend(oap);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	886 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	887
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	888 if (oap->line_count == 1) // delete characters within one line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	889 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	890 if (u_save_cursor() == FAIL) // save line for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	891 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	892
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	893 // 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	894 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	895 && oap->op_type == OP_CHANGE
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	896 && oap->end.lnum == curwin->w_cursor.lnum
5735 50dbef5e774a updated for version 7.4.212 Bram Moolenaar <bram@vim.org> parents: 5730 diff changeset	897 && !oap->is_VIsual)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	898 display_dollar(oap->end.col - !oap->inclusive);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	899
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	900 n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	901
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	902 if (virtual_op)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	903 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	904 // 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	905 // break the tabs which are going to get in our way
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	906 char_u *curline = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	907 int len = (int)STRLEN(curline);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	908
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	909 if (oap->end.coladd != 0
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	910 && (int)oap->end.col >= len - 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	911 && !(oap->start.coladd && (int)oap->end.col >= len - 1))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	912 n++;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	913 // Delete at least one char (e.g, when on a control char).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	914 if (n == 0 && oap->start.coladd != oap->end.coladd)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	915 n = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	916
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	917 // When deleted a char in the line, reset coladd.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	918 if (gchar_cursor() != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	919 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	920 }
6826 bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	921 (void)del_bytes((long)n, !virtual_op,
bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	922 oap->op_type == OP_DELETE && !oap->is_VIsual);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	923 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	924 else // delete characters between lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	925 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	926 pos_T curpos;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	927
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	928 // save deleted and changed lines for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	929 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	930 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	931 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	932
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	933 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	934
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	935 curpos = curwin->w_cursor; // remember curwin->w_cursor
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	936 ++curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	937 del_lines((long)(oap->line_count - 2), FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	938
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	939 // 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	940 n = (oap->end.col + 1 - !oap->inclusive);
6826 bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	941 curwin->w_cursor.col = 0;
bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	942 (void)del_bytes((long)n, !virtual_op,
bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	943 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	944 curwin->w_cursor = curpos; // restore curwin->w_cursor
6826 bf3e6012dfbd patch 7.4.734 Bram Moolenaar <bram@vim.org> parents: 6807 diff changeset	945 (void)do_join(2, FALSE, FALSE, FALSE, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	946 }
25666 649d3e9c5914 patch 8.2.3369: auto formatting after "cw" leaves cursor in wrong spot Bram Moolenaar <Bram@vim.org> parents: 25487 diff changeset	947 if (oap->op_type == OP_DELETE)
649d3e9c5914 patch 8.2.3369: auto formatting after "cw" leaves cursor in wrong spot Bram Moolenaar <Bram@vim.org> parents: 25487 diff changeset	948 auto_format(FALSE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	949 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	950
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	951 msgmore(curbuf->b_ml.ml_line_count - old_lcount);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	952
446 7472c565592a updated for version 7.0117 vimboss parents: 419 diff changeset	953 setmarks:
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	954 if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	955 {
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	956 if (oap->block_mode)
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	957 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	958 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	959 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	960 }
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	961 else
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	962 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	963 curbuf->b_op_start = oap->start;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	964 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	965
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	966 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	967 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	968
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	969 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	970 * Adjust end of operating area for ending on a multi-byte character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	971 * Used for deletion.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	972 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	973 static void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	974 mb_adjust_opend(oparg_T *oap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	975 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	976 char_u *p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	977
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	978 if (oap->inclusive)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	979 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	980 p = ml_get(oap->end.lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	981 oap->end.col += mb_tail_off(p, p + oap->end.col);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	982 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	983 }
15597 536dd2bc5ac9 patch 8.1.0806: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 15555 diff changeset	984
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	985 /*
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	986 * 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	987 * 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	988 */
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	989 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	990 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	991 {
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	992 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	993
28773 d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named Bram Moolenaar <Bram@vim.org> parents: 28169 diff changeset	994 State = MODE_REPLACE;
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	995 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	996 State = n;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	997 // 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	998 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	999 }
15422 b55b89692fd2 patch 8.1.0719: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 15326 diff changeset	1000
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1001 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1002 * Replace a whole area with one character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1003 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1004 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1005 op_replace(oparg_T *oap, int c)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1006 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1007 int n, numc;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1008 int num_chars;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1009 char_u newp, oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1010 size_t oldlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1011 struct block_def bd;
5428 d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1012 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	1013 int had_ctrl_v_cr = FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1014
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1015 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	1016 return OK; // nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1017
13202 2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1018 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	1019 {
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1020 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	1021 c = CAR;
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1022 }
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1023 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	1024 {
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1025 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	1026 c = NL;
2941a86f8aaa patch 8.0.1475: invalid memory access in read_redo() Christian Brabandt <cb@256bit.org> parents: 13072 diff changeset	1027 }
5428 d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1028
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1029 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1030 mb_adjust_opend(oap);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1031
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1032 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1033 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1034 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1035
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1036 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1037 * block mode replace
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1038 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1039 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1040 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1041 bd.is_MAX = (curwin->w_curswant == MAXCOL);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1042 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1043 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1044 curwin->w_cursor.col = 0; // make sure cursor position is valid
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1045 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1046 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	1047 continue; // nothing to replace
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1048
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1049 // 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	1050 // 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	1051 // 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	1052 // 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	1053 // coladd offset as part of "startspaces"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1054 if (virtual_op && bd.is_short && *bd.textstart == NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1055 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1056 pos_T vpos;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1057
1982 b1b09b68d706 updated for version 7.2-279 vimboss parents: 1969 diff changeset	1058 vpos.lnum = curwin->w_cursor.lnum;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1059 getvpos(&vpos, oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1060 bd.startspaces += vpos.coladd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1061 n = bd.startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1062 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1063 else
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1064 // allow for pre spaces
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1065 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1066
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1067 // allow for post spp
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1068 n += (bd.endspaces
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1069 && !bd.is_oneChar
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1070 && 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	1071 // Figure out how many characters to replace.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1072 numc = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1073 if (bd.is_short && (!virtual_op \|\| bd.is_MAX))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1074 numc -= (oap->end_vcol - bd.end_vcol) + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1075
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1076 // 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	1077 // times.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1078 if ((*mb_char2cells)(c) > 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1079 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1080 if ((numc & 1) && !bd.is_short)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1081 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1082 ++bd.endspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1083 ++n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1084 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1085 numc = numc / 2;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1086 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1087
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1088 // Compute bytes needed, move character count to num_chars.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1089 num_chars = numc;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1090 numc = (mb_char2len)(c);
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1091 // oldlen includes textlen, so don't double count
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1092 n += numc - bd.textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1093
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1094 oldp = ml_get_curline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1095 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	1096 newp = alloc(oldlen + 1 + n);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1097 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1098 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1099 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	1100 // copy up to deleted part
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1101 mch_memmove(newp, oldp, (size_t)bd.textcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1102 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	1103 // insert pre-spaces
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	1104 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	1105 // 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	1106 // 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	1107 // literally.
5428 d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1108 if (had_ctrl_v_cr \|\| (c != '\r' && c != '\n'))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1109 {
5428 d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1110 if (has_mbyte)
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1111 {
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1112 n = (int)STRLEN(newp);
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1113 while (--num_chars >= 0)
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1114 n += (*mb_char2bytes)(c, newp + n);
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1115 }
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1116 else
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	1117 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	1118 if (!bd.is_short)
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1119 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1120 // insert post-spaces
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	1121 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	1122 // copy the part after the changed part
5428 d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1123 STRMOVE(newp + STRLEN(newp), oldp);
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1124 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1125 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1126 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1127 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1128 // 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	1129 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	1130 if (after_p != NULL)
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1131 STRMOVE(after_p, oldp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1132 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1133 // replace the line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1134 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	1135 if (after_p != NULL)
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1136 {
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1137 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	1138 appended_lines_mark(curwin->w_cursor.lnum, 1L);
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1139 oap->end.lnum++;
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1140 vim_free(after_p);
d06223965468 updated for version 7.4.064 Bram Moolenaar <bram@vim.org> parents: 5415 diff changeset	1141 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1142 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1143 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1144 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1145 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1146 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1147 * MCHAR and MLINE motion replace.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1148 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1149 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1150 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1151 oap->start.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1152 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1153 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1154 if (oap->end.col)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1155 --oap->end.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1156 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1157 else if (!oap->inclusive)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1158 dec(&(oap->end));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1159
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11065 diff changeset	1160 while (LTOREQ_POS(curwin->w_cursor, oap->end))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1161 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1162 n = gchar_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1163 if (n != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1164 {
26581 8da90cdcec68 patch 8.2.3820: "vrc" does not replace composing characters Bram Moolenaar <Bram@vim.org> parents: 26518 diff changeset	1165 int new_byte_len = (*mb_char2len)(c);
8da90cdcec68 patch 8.2.3820: "vrc" does not replace composing characters Bram Moolenaar <Bram@vim.org> parents: 26518 diff changeset	1166 int old_byte_len = mb_ptr2len(ml_get_cursor());
8da90cdcec68 patch 8.2.3820: "vrc" does not replace composing characters Bram Moolenaar <Bram@vim.org> parents: 26518 diff changeset	1167
8da90cdcec68 patch 8.2.3820: "vrc" does not replace composing characters Bram Moolenaar <Bram@vim.org> parents: 26518 diff changeset	1168 if (new_byte_len > 1 \|\| old_byte_len > 1)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1169 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1170 // 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	1171 // 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	1172 if (curwin->w_cursor.lnum == oap->end.lnum)
26581 8da90cdcec68 patch 8.2.3820: "vrc" does not replace composing characters Bram Moolenaar <Bram@vim.org> parents: 26518 diff changeset	1173 oap->end.col += new_byte_len - old_byte_len;
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	1174 replace_character(c);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1175 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1176 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1177 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1178 if (n == TAB)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1179 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1180 int end_vcol = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1181
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1182 if (curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1183 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1184 // 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	1185 // the tab breaks
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1186 end_vcol = getviscol2(oap->end.col,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1187 oap->end.coladd);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1188 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1189 coladvance_force(getviscol());
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1190 if (curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1191 getvpos(&oap->end, end_vcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1192 }
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	1193 PBYTE(curwin->w_cursor, c);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1194 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1195 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1196 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1197 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1198 int virtcols = oap->end.coladd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1199
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1200 if (curwin->w_cursor.lnum == oap->start.lnum
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1201 && oap->start.col == oap->end.col && oap->start.coladd)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1202 virtcols -= oap->start.coladd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1203
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1204 // 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	1205 // 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	1206 // trample the NUL byte.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1207 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1208 curwin->w_cursor.col -= (virtcols + 1);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1209 for (; virtcols >= 0; virtcols--)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1210 {
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	1211 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	1212 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	1213 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	1214 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	1215 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	1216 break;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1217 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1218 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1219
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1220 // Advance to next character, stop at the end of the file.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1221 if (inc_cursor() == -1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1222 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1223 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1224 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1225
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1226 curwin->w_cursor = oap->start;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1227 check_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1228 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1229
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	1230 if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	1231 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1232 // Set "'[" and "']" marks.
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	1233 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	1234 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	1235 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1236
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1237 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1238 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1239
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 7576 diff changeset	1240 static int swapchars(int op_type, pos_T *pos, int length);
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1241
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1242 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1243 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1244 */
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	1245 static void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1246 op_tilde(oparg_T *oap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1247 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1248 pos_T pos;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1249 struct block_def bd;
1528 e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1250 int did_change = FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1251
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1252 if (u_save((linenr_T)(oap->start.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1253 (linenr_T)(oap->end.lnum + 1)) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1254 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1255
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1256 pos = oap->start;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1257 if (oap->block_mode) // Visual block mode
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1258 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1259 for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1260 {
1766 bb4797166e4c updated for version 7.2-064 vimboss parents: 1622 diff changeset	1261 int one_change;
bb4797166e4c updated for version 7.2-064 vimboss parents: 1622 diff changeset	1262
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1263 block_prep(oap, &bd, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1264 pos.col = bd.textcol;
1766 bb4797166e4c updated for version 7.2-064 vimboss parents: 1622 diff changeset	1265 one_change = swapchars(oap->op_type, &pos, bd.textlen);
bb4797166e4c updated for version 7.2-064 vimboss parents: 1622 diff changeset	1266 did_change \|= one_change;
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1267
5735 50dbef5e774a updated for version 7.4.212 Bram Moolenaar <bram@vim.org> parents: 5730 diff changeset	1268 #ifdef FEAT_NETBEANS_INTG
2210 8c6a66e2b3cc Add :nbstart and :nbclose. Bram Moolenaar <bram@vim.org> parents: 2061 diff changeset	1269 if (netbeans_active() && one_change)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1270 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1271 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1272
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 22 diff changeset	1273 netbeans_removed(curbuf, pos.lnum, bd.textcol,
f6033dcbaf31 updated for version 7.0020 vimboss parents: 22 diff changeset	1274 (long)bd.textlen);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1275 netbeans_inserted(curbuf, pos.lnum, bd.textcol,
2210 8c6a66e2b3cc Add :nbstart and :nbclose. Bram Moolenaar <bram@vim.org> parents: 2061 diff changeset	1276 &ptr[bd.textcol], bd.textlen);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1277 }
5735 50dbef5e774a updated for version 7.4.212 Bram Moolenaar <bram@vim.org> parents: 5730 diff changeset	1278 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1279 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1280 if (did_change)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1281 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1282 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1283 else // not block mode
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1284 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1285 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1286 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1287 oap->start.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1288 pos.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1289 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1290 if (oap->end.col)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1291 --oap->end.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1292 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1293 else if (!oap->inclusive)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1294 dec(&(oap->end));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1295
1528 e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1296 if (pos.lnum == oap->end.lnum)
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1297 did_change = swapchars(oap->op_type, &pos,
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1298 oap->end.col - pos.col + 1);
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1299 else
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1300 for (;;)
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1301 {
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1302 did_change \|= swapchars(oap->op_type, &pos,
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1303 pos.lnum == oap->end.lnum ? oap->end.col + 1:
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1304 (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	1305 if (LTOREQ_POS(oap->end, pos) \|\| inc(&pos) == -1)
1528 e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1306 break;
e212d1a40ca9 updated for version 7.1-243 vimboss parents: 1525 diff changeset	1307 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1308 if (did_change)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1309 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1310 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1311 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1312 #ifdef FEAT_NETBEANS_INTG
28169 bef82285dda0 patch 8.2.4610: some conditions are always true Bram Moolenaar <Bram@vim.org> parents: 27724 diff changeset	1313 if (netbeans_active())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1314 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1315 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1316 int count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1317
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1318 pos = oap->start;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1319 while (pos.lnum < oap->end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1320 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1321 ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
835 8bebcabccc2c updated for version 7.0e01 vimboss parents: 777 diff changeset	1322 count = (int)STRLEN(ptr) - pos.col;
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 22 diff changeset	1323 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1324 netbeans_inserted(curbuf, pos.lnum, pos.col,
2210 8c6a66e2b3cc Add :nbstart and :nbclose. Bram Moolenaar <bram@vim.org> parents: 2061 diff changeset	1325 &ptr[pos.col], count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1326 pos.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1327 pos.lnum++;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1328 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1329 ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1330 count = oap->end.col - pos.col + 1;
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 22 diff changeset	1331 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1332 netbeans_inserted(curbuf, pos.lnum, pos.col,
2210 8c6a66e2b3cc Add :nbstart and :nbclose. Bram Moolenaar <bram@vim.org> parents: 2061 diff changeset	1333 &ptr[pos.col], count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1334 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1335 #endif
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
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1339 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	1340 // No change: need to remove the Visual selection
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1341 redraw_curbuf_later(INVERTED);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1342
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	1343 if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	1344 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	1345 // Set '[ and '] marks.
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	1346 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	1347 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	1348 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1349
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1350 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	1351 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	1352 oap->line_count), oap->line_count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1353 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1354
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1355 /*
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1356 * Invoke swapchar() on "length" bytes at position "pos".
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1357 * "pos" is advanced to just after the changed characters.
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1358 * "length" is rounded up to include the whole last multi-byte character.
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1359 * Also works correctly when the number of bytes changes.
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1360 * Returns TRUE if some character was changed.
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1361 */
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1362 static int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1363 swapchars(int op_type, pos_T *pos, int length)
1525 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 int todo;
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1366 int did_change = 0;
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 for (todo = length; todo > 0; --todo)
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1369 {
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1370 if (has_mbyte)
5288 46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1371 {
46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1372 int len = (*mb_ptr2len)(ml_get_pos(pos));
46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1373
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1374 // we're counting bytes, not characters
5288 46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1375 if (len > 0)
46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1376 todo -= len - 1;
46cf49cc9289 updated for version 7.4b.020 Bram Moolenaar <bram@vim.org> parents: 5245 diff changeset	1377 }
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1378 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	1379 if (inc(pos) == -1) // at end of file
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1380 break;
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1381 }
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1382 return did_change;
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1383 }
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1384
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1385 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1386 * If op_type == OP_UPPER: make uppercase,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1387 * if op_type == OP_LOWER: make lowercase,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1388 * if op_type == OP_ROT13: do rot13 encoding,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1389 * else swap case of character at 'pos'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1390 * returns TRUE when something actually changed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1391 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1392 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1393 swapchar(int op_type, pos_T *pos)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1394 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1395 int c;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1396 int nc;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1397
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1398 c = gchar_pos(pos);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1399
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1400 // Only do rot13 encoding for ASCII characters.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1401 if (c >= 0x80 && op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1402 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1403
1525 76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1404 if (op_type == OP_UPPER && c == 0xdf
76985a406456 updated for version 7.1-240 vimboss parents: 1516 diff changeset	1405 && (enc_latin1like \|\| STRCMP(p_enc, "iso-8859-2") == 0))
493 06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1406 {
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1407 pos_T sp = curwin->w_cursor;
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1408
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1409 // Special handling of German sharp s: change to "SS".
493 06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1410 curwin->w_cursor = *pos;
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1411 del_char(FALSE);
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1412 ins_char('S');
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1413 ins_char('S');
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1414 curwin->w_cursor = sp;
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1415 inc(pos);
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1416 }
06364aa0d597 updated for version 7.0135 vimboss parents: 480 diff changeset	1417
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1418 if (enc_dbcs != 0 && c >= 0x100) // No lower/uppercase letter
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1419 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1420 nc = c;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1421 if (MB_ISLOWER(c))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1422 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1423 if (op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1424 nc = ROT13(c, 'a');
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1425 else if (op_type != OP_LOWER)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1426 nc = MB_TOUPPER(c);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1427 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1428 else if (MB_ISUPPER(c))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1429 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1430 if (op_type == OP_ROT13)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1431 nc = ROT13(c, 'A');
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1432 else if (op_type != OP_UPPER)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1433 nc = MB_TOLOWER(c);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1434 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1435 if (nc != c)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1436 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1437 if (enc_utf8 && (c >= 0x80 \|\| nc >= 0x80))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1438 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1439 pos_T sp = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1440
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1441 curwin->w_cursor = *pos;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1442 // 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	1443 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1444 ins_char(nc);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1445 curwin->w_cursor = sp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1446 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1447 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	1448 PBYTE(*pos, nc);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1449 return TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1450 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1451 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1452 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1453
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1454 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1455 * op_insert - Insert and append operators for Visual mode.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1456 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1457 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1458 op_insert(oparg_T *oap, long count1)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1459 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1460 long ins_len, pre_textlen = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1461 char_u firstline, ins_text;
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1462 colnr_T ind_pre_col = 0, ind_post_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1463 int ind_pre_vcol = 0, ind_post_vcol = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1464 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1465 int i;
6579 a287b0e9e87b updated for version 7.4.616 Bram Moolenaar <bram@vim.org> parents: 6557 diff changeset	1466 pos_T t1;
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1467 pos_T start_insert;
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1468 // offset when cursor was moved in insert mode
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1469 int offset = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1470
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1471 // edit() changes this - record it for OP_APPEND
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1472 bd.is_MAX = (curwin->w_curswant == MAXCOL);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1473
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1474 // vis block is still marked. Get rid of it now.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1475 curwin->w_cursor.lnum = oap->start.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1476 update_screen(INVERTED);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1477
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1478 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1479 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1480 // 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	1481 // 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	1482 // 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	1483 // coladvance_force().
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1484 // coladvance_force() uses get_ve_flags() to get the 'virtualedit'
25487 c26ff3203b43 patch 8.2.3280: 'virtualedit' local to buffer is not the best solution Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	1485 // state for the current window. To override that state, we need to
c26ff3203b43 patch 8.2.3280: 'virtualedit' local to buffer is not the best solution Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	1486 // set the window-local value of ve_flags rather than the global value.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1487 if (curwin->w_cursor.coladd > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1488 {
25487 c26ff3203b43 patch 8.2.3280: 'virtualedit' local to buffer is not the best solution Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	1489 int old_ve_flags = curwin->w_ve_flags;
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1490
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1491 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1492 return;
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1493
25487 c26ff3203b43 patch 8.2.3280: 'virtualedit' local to buffer is not the best solution Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	1494 curwin->w_ve_flags = VE_ALL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1495 coladvance_force(oap->op_type == OP_APPEND
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1496 ? oap->end_vcol + 1 : getviscol());
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1497 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1498 --curwin->w_cursor.col;
25487 c26ff3203b43 patch 8.2.3280: 'virtualedit' local to buffer is not the best solution Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	1499 curwin->w_ve_flags = old_ve_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1500 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1501 // Get the info about the block before entering the text
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1502 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	1503 // Get indent information
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1504 ind_pre_col = (colnr_T)getwhitecols_curline();
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1505 ind_pre_vcol = get_indent();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1506 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	1507
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1508 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1509 firstline += bd.textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1510 pre_textlen = (long)STRLEN(firstline);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1511 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1512
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1513 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1514 {
15636 6f1c7e9a6393 patch 8.1.0826: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 15597 diff changeset	1515 if (oap->block_mode && curwin->w_cursor.coladd == 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1516 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1517 // Move the cursor to the character right of the block.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1518 curwin->w_set_curswant = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1519 while (*ml_get_cursor() != NUL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1520 && (curwin->w_cursor.col < bd.textcol + bd.textlen))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1521 ++curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1522 if (bd.is_short && !bd.is_MAX)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1523 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1524 // 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	1525 // values in "bd".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1526 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1527 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1528 for (i = 0; i < bd.endspaces; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1529 ins_char(' ');
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1530 bd.textlen += bd.endspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1531 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1532 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1533 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1534 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1535 curwin->w_cursor = oap->end;
893 bf7803d0f5b9 updated for version 7.0-019 vimboss parents: 856 diff changeset	1536 check_cursor_col();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1537
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1538 // 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	1539 if (!LINEEMPTY(curwin->w_cursor.lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1540 && oap->start_vcol != oap->end_vcol)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1541 inc_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1542 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1543 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1544
6579 a287b0e9e87b updated for version 7.4.616 Bram Moolenaar <bram@vim.org> parents: 6557 diff changeset	1545 t1 = oap->start;
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1546 start_insert = curwin->w_cursor;
10803 065da86ca6d2 patch 8.0.0291: Visual block insertion does not insert in all lines Christian Brabandt <cb@256bit.org> parents: 10785 diff changeset	1547 (void)edit(NUL, FALSE, (linenr_T)count1);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1548
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1549 // 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	1550 // 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	1551 // 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	1552 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	1553 && 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	1554 oap->start = curbuf->b_op_start_orig;
a287b0e9e87b updated for version 7.4.616 Bram Moolenaar <bram@vim.org> parents: 6557 diff changeset	1555
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1556 // 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	1557 // nothing.
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1558 // 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	1559 if (curwin->w_cursor.lnum != oap->start.lnum \|\| got_int)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1560 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1561
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1562 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1563 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1564 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	1565 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	1566 size_t len;
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1567 int add;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1568
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1569 // 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	1570 // but only do that, if the indent actually increased.
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1571 ind_post_col = (colnr_T)getwhitecols_curline();
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1572 if (curbuf->b_op_start.col > ind_pre_col && ind_post_col > ind_pre_col)
12327 17ed65e87db1 patch 8.0.1043: warning for uninitialized variable Christian Brabandt <cb@256bit.org> parents: 12323 diff changeset	1573 {
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1574 bd.textcol += ind_post_col - ind_pre_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1575 ind_post_vcol = get_indent();
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1576 bd.start_vcol += ind_post_vcol - ind_pre_vcol;
13620 4faf77b96432 patch 8.0.1682: auto indenting breaks inserting a block Christian Brabandt <cb@256bit.org> parents: 13614 diff changeset	1577 did_indent = TRUE;
12327 17ed65e87db1 patch 8.0.1043: warning for uninitialized variable Christian Brabandt <cb@256bit.org> parents: 12323 diff changeset	1578 }
17ed65e87db1 patch 8.0.1043: warning for uninitialized variable Christian Brabandt <cb@256bit.org> parents: 12323 diff changeset	1579
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1580 // 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	1581 // 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	1582 // 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	1583 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	1584 && !bd.is_MAX && !did_indent)
5471 70c3289803b3 updated for version 7.4.085 Bram Moolenaar <bram@vim.org> parents: 5438 diff changeset	1585 {
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1586 int t = getviscol2(curbuf->b_op_start_orig.col,
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1587 curbuf->b_op_start_orig.coladd);
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1588
27724 2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1589 if (oap->op_type == OP_INSERT
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1590 && oap->start.col + oap->start.coladd
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1591 != curbuf->b_op_start_orig.col
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1592 + curbuf->b_op_start_orig.coladd)
27724 2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1593 {
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1594 oap->start.col = curbuf->b_op_start_orig.col;
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1595 pre_textlen -= t - oap->start_vcol;
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1596 oap->start_vcol = t;
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1597 }
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1598 else if (oap->op_type == OP_APPEND
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1599 && oap->start.col + oap->start.coladd
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1600 >= curbuf->b_op_start_orig.col
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1601 + curbuf->b_op_start_orig.coladd)
5471 70c3289803b3 updated for version 7.4.085 Bram Moolenaar <bram@vim.org> parents: 5438 diff changeset	1602 {
27724 2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1603 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	1604 // 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	1605 pre_textlen += bd.textlen;
6579 a287b0e9e87b updated for version 7.4.616 Bram Moolenaar <bram@vim.org> parents: 6557 diff changeset	1606 pre_textlen -= t - oap->start_vcol;
27724 2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1607 oap->start_vcol = t;
2261ef91b850 patch 8.2.4388: dead code in op_insert() Bram Moolenaar <Bram@vim.org> parents: 27521 diff changeset	1608 oap->op_type = OP_INSERT;
5471 70c3289803b3 updated for version 7.4.085 Bram Moolenaar <bram@vim.org> parents: 5438 diff changeset	1609 }
70c3289803b3 updated for version 7.4.085 Bram Moolenaar <bram@vim.org> parents: 5438 diff changeset	1610 }
70c3289803b3 updated for version 7.4.085 Bram Moolenaar <bram@vim.org> parents: 5438 diff changeset	1611
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1612 // Spaces and tabs in the indent may have changed to other spaces and
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1613 // tabs. Get the starting column again and correct the length.
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1614 // Don't do this when "$" used, end-of-line will have changed.
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1615 //
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1616 // if indent was added and the inserted text was after the indent,
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1617 // correct the selection for the new indent.
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1618 if (did_indent && bd.textcol - ind_post_col > 0)
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1619 {
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1620 oap->start.col += ind_post_col - ind_pre_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1621 oap->start_vcol += ind_post_vcol - ind_pre_vcol;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1622 oap->end.col += ind_post_col - ind_pre_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1623 oap->end_vcol += ind_post_vcol - ind_pre_vcol;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1624 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1625 block_prep(oap, &bd2, oap->start.lnum, TRUE);
26313 74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1626 if (did_indent && bd.textcol - ind_post_col > 0)
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1627 {
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1628 // undo for where "oap" is used below
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1629 oap->start.col -= ind_post_col - ind_pre_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1630 oap->start_vcol -= ind_post_vcol - ind_pre_vcol;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1631 oap->end.col -= ind_post_col - ind_pre_col;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1632 oap->end_vcol -= ind_post_vcol - ind_pre_vcol;
74e706afae3f patch 8.2.3687: blockwise insert does not handle autoindent properly Bram Moolenaar <Bram@vim.org> parents: 26307 diff changeset	1633 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1634 if (!bd.is_MAX \|\| bd2.textlen < bd.textlen)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1635 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1636 if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1637 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1638 pre_textlen += bd2.textlen - bd.textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1639 if (bd2.endspaces)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1640 --bd2.textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1641 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1642 bd.textcol = bd2.textcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1643 bd.textlen = bd2.textlen;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1644 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1645
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1646 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1647 * Subsequent calls to ml_get() flush the firstline data - take a
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1648 * copy of the required string.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1649 */
13814 7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1650 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	1651 len = STRLEN(firstline);
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1652 add = bd.textcol;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1653 if (oap->op_type == OP_APPEND)
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1654 {
13814 7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1655 add += bd.textlen;
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1656 // account for pressing cursor in insert mode when '$' was used
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1657 if (bd.is_MAX
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1658 && (start_insert.lnum == Insstart.lnum
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1659 && start_insert.col > Insstart.col))
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1660 {
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1661 offset = (start_insert.col - Insstart.col);
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1662 add -= offset;
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1663 if (oap->end_vcol > offset)
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1664 oap->end_vcol -= (offset + 1);
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1665 else
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1666 // moved outside of the visual block, what to do?
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1667 return;
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1668 }
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1669 }
13814 7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1670 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	1671 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	1672 else
7ed76dcf0d94 patch 8.0.1779: deleting in a block selection causes problems Christian Brabandt <cb@256bit.org> parents: 13620 diff changeset	1673 firstline += add;
25072 bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1674 if (pre_textlen >= 0 && (ins_len =
bd46322bea66 patch 8.2.3073: when cursor is move for block append wrong text is inserted Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	1675 (long)STRLEN(firstline) - pre_textlen - offset) > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1676 {
20830 9064044fd4f6 patch 8.2.0967: unnecessary type casts for vim_strnsave() Bram Moolenaar <Bram@vim.org> parents: 20822 diff changeset	1677 ins_text = vim_strnsave(firstline, ins_len);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1678 if (ins_text != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1679 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1680 // block handled here
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1681 if (u_save(oap->start.lnum,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1682 (linenr_T)(oap->end.lnum + 1)) == OK)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1683 block_insert(oap, ins_text, (oap->op_type == OP_INSERT),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1684 &bd);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1685
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1686 curwin->w_cursor.col = oap->start.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1687 check_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1688 vim_free(ins_text);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1689 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1690 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1691 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1692 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1693
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1694 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1695 * op_change - handle a change operation
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1696 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1697 * return TRUE if edit() returns because of a CTRL-O command
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1698 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1699 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1700 op_change(oparg_T *oap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1701 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1702 colnr_T l;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1703 int retval;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1704 long offset;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1705 linenr_T linenr;
1392 27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1706 long ins_len;
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1707 long pre_textlen = 0;
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1708 long pre_indent = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1709 char_u *firstline;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1710 char_u ins_text, newp, *oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1711 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1712
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1713 l = oap->start.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1714 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1715 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1716 l = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1717 #ifdef FEAT_SMARTINDENT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1718 if (!p_paste && curbuf->b_p_si
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1719 # ifdef FEAT_CINDENT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1720 && !curbuf->b_p_cin
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1721 # endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1722 )
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1723 can_si = TRUE; // It's like opening a new line, do si
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1724 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1725 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1726
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1727 // 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	1728 // save for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1729 if (curbuf->b_ml.ml_flags & ML_EMPTY)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1730 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1731 if (u_save_cursor() == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1732 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1733 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1734 else if (op_delete(oap) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1735 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1736
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11065 diff changeset	1737 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1738 && !virtual_op)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1739 inc_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1740
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1741 // 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	1742 // skip blank lines too
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1743 if (oap->block_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1744 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1745 // Add spaces before getting the current line length.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1746 if (virtual_op && (curwin->w_cursor.coladd > 0
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1747 \|\| gchar_cursor() == NUL))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1748 coladvance_force(getviscol());
1392 27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1749 firstline = ml_get(oap->start.lnum);
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1750 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	1751 pre_indent = (long)getwhitecols(firstline);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1752 bd.textcol = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1753 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1754
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1755 #if defined(FEAT_LISP) \|\| defined(FEAT_CINDENT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1756 if (oap->motion_type == MLINE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1757 fix_indent();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1758 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1759
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1760 retval = edit(NUL, FALSE, (linenr_T)1);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1761
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1762 /*
39 410fa1a31baf updated for version 7.0023 vimboss parents: 36 diff changeset	1763 * 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	1764 * block.
1477 2951f28a9bd3 updated for version 7.1-192 vimboss parents: 1451 diff changeset	1765 * Don't repeat the insert when Insert mode ended with CTRL-C.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1766 */
1477 2951f28a9bd3 updated for version 7.1-192 vimboss parents: 1451 diff changeset	1767 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1768 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1769 // 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	1770 // the indent, exclude that indent change from the inserted text.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1771 firstline = ml_get(oap->start.lnum);
1403 871231399cf5 updated for version 7.1-118 vimboss parents: 1392 diff changeset	1772 if (bd.textcol > (colnr_T)pre_indent)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1773 {
12323 4dba3e4f3b01 patch 8.0.1041: bogus characters when indenting during visual-block append Christian Brabandt <cb@256bit.org> parents: 11997 diff changeset	1774 long new_indent = (long)getwhitecols(firstline);
1392 27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1775
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1776 pre_textlen += new_indent - pre_indent;
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1777 bd.textcol += new_indent - pre_indent;
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1778 }
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1779
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1780 ins_len = (long)STRLEN(firstline) - pre_textlen;
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1781 if (ins_len > 0)
27782797c331 updated for version 7.1-107 vimboss parents: 1304 diff changeset	1782 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1783 // 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	1784 // 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	1785 if ((ins_text = alloc(ins_len + 1)) != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1786 {
419 f713fc55bf7b updated for version 7.0109 vimboss parents: 356 diff changeset	1787 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1788 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1789 linenr++)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1790 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1791 block_prep(oap, &bd, linenr, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1792 if (!bd.is_short \|\| virtual_op)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1793 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1794 pos_T vpos;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1795
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1796 // 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	1797 // initial coladd offset as part of "startspaces"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1798 if (bd.is_short)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1799 {
1982 b1b09b68d706 updated for version 7.2-279 vimboss parents: 1969 diff changeset	1800 vpos.lnum = linenr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1801 (void)getvpos(&vpos, oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1802 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1803 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1804 vpos.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1805 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	1806 newp = alloc(STRLEN(oldp) + vpos.coladd + ins_len + 1);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1807 if (newp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1808 continue;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1809 // copy up to block start
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1810 mch_memmove(newp, oldp, (size_t)bd.textcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1811 offset = bd.textcol;
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	1812 vim_memset(newp + offset, ' ', (size_t)vpos.coladd);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1813 offset += vpos.coladd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1814 mch_memmove(newp + offset, ins_text, (size_t)ins_len);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1815 offset += ins_len;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1816 oldp += bd.textcol;
1622 149d8b46404c updated for version 7.2a vimboss parents: 1563 diff changeset	1817 STRMOVE(newp + offset, oldp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1818 ml_replace(linenr, newp, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1819 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1820 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1821 check_cursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1822
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1823 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1824 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1825 vim_free(ins_text);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1826 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1827 }
25666 649d3e9c5914 patch 8.2.3369: auto formatting after "cw" leaves cursor in wrong spot Bram Moolenaar <Bram@vim.org> parents: 25487 diff changeset	1828 auto_format(FALSE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1829
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1830 return retval;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1831 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1832
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1833 /*
844 d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1834 * 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	1835 * there move it left.
d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1836 */
d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1837 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1838 adjust_cursor_eol(void)
844 d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1839 {
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1840 unsigned int cur_ve_flags = get_ve_flags();
ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1841
844 d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1842 if (curwin->w_cursor.col > 0
d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1843 && gchar_cursor() == NUL
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1844 && (cur_ve_flags & VE_ONEMORE) == 0
28773 d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named Bram Moolenaar <Bram@vim.org> parents: 28169 diff changeset	1845 && !(restart_edit \|\| (State & MODE_INSERT)))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1846 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1847 // Put the cursor on the last character in the line.
555 a5efb97bc104 updated for version 7.0157 vimboss parents: 530 diff changeset	1848 dec_cursor();
844 d3bbb5dd3913 updated for version 7.0f02 vimboss parents: 840 diff changeset	1849
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25072 diff changeset	1850 if (cur_ve_flags == VE_ALL)
557 862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1851 {
862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1852 colnr_T scol, ecol;
862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1853
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1854 // Coladd is set to the width of the last character.
557 862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1855 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol);
862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1856 curwin->w_cursor.coladd = ecol - scol + 1;
862863033fdd updated for version 7.0158 vimboss parents: 555 diff changeset	1857 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1858 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1859 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1860
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1861 /*
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1862 * 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	1863 * 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	1864 * 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	1865 * "is_comment".
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1866 * line - line to be processed,
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1867 * 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	1868 * comment,
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1869 * 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	1870 * 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	1871 * comment.
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1872 */
11131 8d9ecf09183a patch 8.0.0453: adding fold marker creates new comment Christian Brabandt <cb@256bit.org> parents: 11129 diff changeset	1873 char_u *
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1874 skip_comment(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1875 char_u *line,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1876 int process,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1877 int include_space,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1878 int *is_comment)
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1879 {
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1880 char_u *comment_flags = NULL;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1881 int lead_len;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1882 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	1883
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1884 *is_comment = FALSE;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1885 if (leader_offset != -1)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1886 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1887 // 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	1888 // 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	1889 while (*comment_flags)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1890 {
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1891 if (*comment_flags == COM_END
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1892 \|\| *comment_flags == ':')
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1893 break;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1894 ++comment_flags;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1895 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1896 if (*comment_flags != COM_END)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1897 *is_comment = TRUE;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1898 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1899
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1900 if (process == FALSE)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1901 return line;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1902
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1903 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	1904
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1905 if (lead_len == 0)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1906 return line;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1907
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1908 // Find:
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1909 // - COM_END,
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1910 // - colon,
7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1911 // whichever comes first.
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1912 while (*comment_flags)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1913 {
3580 297771eff080 updated for version 7.3.550 Bram Moolenaar <bram@vim.org> parents: 3576 diff changeset	1914 if (*comment_flags == COM_END
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1915 \|\| *comment_flags == ':')
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1916 break;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1917 ++comment_flags;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1918 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1919
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1920 // 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	1921 // 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	1922 // 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	1923 if (comment_flags == ':' \|\| comment_flags == NUL)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1924 line += lead_len;
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 return line;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1927 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1928
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1929 /*
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1930 * 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	1931 * 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	1932 * 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	1933 * leaders should not be removed.
75f222d67cea updated for version 7.4.267 Bram Moolenaar <bram@vim.org> parents: 5828 diff changeset	1934 * 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	1935 * to set those marks.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1936 *
1217 82274b284600 updated for version 7.1b vimboss parents: 1157 diff changeset	1937 * return FAIL for failure, OK otherwise
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1938 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1939 int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1940 do_join(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1941 long count,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1942 int insert_space,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1943 int save_undo,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1944 int use_formatoptions UNUSED,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1945 int setmark)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1946 {
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1947 char_u *curr = NULL;
2597 c3b5d3fe9404 updated for version 7.3.020 Bram Moolenaar <bram@vim.org> parents: 2451 diff changeset	1948 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	1949 char_u *cend;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1950 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	1951 size_t newp_len;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1952 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	1953 int endcurr1 = NUL;
3e4574a4b627 Fix a few compiler warnings. Bram Moolenaar <bram@vim.org> parents: 2298 diff changeset	1954 int endcurr2 = NUL;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1955 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	1956 int sumsize = 0; // size of the long new line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1957 linenr_T t;
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1958 colnr_T col = 0;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1959 int ret = OK;
3574 4f4db5d661c4 updated for version 7.3.547 Bram Moolenaar <bram@vim.org> parents: 3562 diff changeset	1960 int *comments = NULL;
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1961 int remove_comments = (use_formatoptions == TRUE)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1962 && has_format_option(FO_REMOVE_COMS);
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1963 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	1964 #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	1965 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	1966 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	1967 #endif
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1968
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1969 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	1970 (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	1971 return FAIL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1972
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1973 // 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	1974 // 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	1975 // 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	1976 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	1977 if (spaces == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1978 return FAIL;
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1979 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1980 {
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	1981 comments = lalloc_clear(count * sizeof(int), TRUE);
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1982 if (comments == NULL)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1983 {
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1984 vim_free(spaces);
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1985 return FAIL;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1986 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	1987 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1988
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1989 /*
16678 6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16429 diff changeset	1990 * 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	1991 * 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	1992 * This loops forward over the joined lines.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1993 */
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1994 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	1995 {
2597 c3b5d3fe9404 updated for version 7.3.020 Bram Moolenaar <bram@vim.org> parents: 2451 diff changeset	1996 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	1997 #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	1998 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	1999 #endif
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	2000 if (t == 0 && setmark && (cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
5664 647e6bb15aa3 updated for version 7.4.178 Bram Moolenaar <bram@vim.org> parents: 5596 diff changeset	2001 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2002 // Set the '[ mark.
5664 647e6bb15aa3 updated for version 7.4.178 Bram Moolenaar <bram@vim.org> parents: 5596 diff changeset	2003 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	2004 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	2005 }
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2006 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2007 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2008 // 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	2009 // previous line is not a comment.
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2010 if (t > 0 && prev_was_comment)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2011 {
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2012
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2013 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	2014 &prev_was_comment);
3576 8625e38066db updated for version 7.3.548 Bram Moolenaar <bram@vim.org> parents: 3574 diff changeset	2015 comments[t] = (int)(new_curr - curr);
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2016 curr = new_curr;
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2017 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2018 else
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2019 curr = skip_comment(curr, FALSE, insert_space,
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2020 &prev_was_comment);
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2021 }
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2022
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2023 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	2024 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2025 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	2026 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	2027 && 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	2028 && (!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	2029 \|\| (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	2030 && (!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	2031 \|\| (mb_ptr2char(curr) < 0x100
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal Bram Moolenaar <Bram@vim.org> parents: 20655 diff changeset	2032 && !(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	2033 \|\| (endcurr1 < 0x100
cea8ae407452 patch 8.2.0901: formatting CJK text isn't optimal Bram Moolenaar <Bram@vim.org> parents: 20655 diff changeset	2034 && !(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	2035 )
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2036 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2037 // 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	2038 if (endcurr1 == ' ')
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2039 endcurr1 = endcurr2;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2040 else
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2041 ++spaces[t];
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2042 // 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	2043 if ( p_js
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2044 && (endcurr1 == '.'
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2045 \|\| (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	2046 && (endcurr1 == '?' \|\| endcurr1 == '!'))))
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2047 ++spaces[t];
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2048 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2049 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2050 currsize = (int)STRLEN(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2051 sumsize += currsize + spaces[t];
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2052 endcurr1 = endcurr2 = NUL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2053 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	2054 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2055 if (has_mbyte)
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 = curr + currsize;
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2058 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	2059 endcurr1 = (*mb_ptr2char)(cend);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2060 if (cend > curr)
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2061 {
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2062 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	2063 endcurr2 = (*mb_ptr2char)(cend);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2064 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2065 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2066 else
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2067 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2068 endcurr1 = *(curr + currsize - 1);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2069 if (currsize > 1)
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2070 endcurr2 = *(curr + currsize - 2);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2071 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2072 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2073 line_breakcheck();
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2074 if (got_int)
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2075 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2076 ret = FAIL;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2077 goto theend;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2078 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2079 }
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2080
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2081 // 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	2082 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	2083
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2084 // 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	2085 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	2086 #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	2087 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	2088 #endif
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20237 diff changeset	2089 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	2090 if (newp == NULL)
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	2091 {
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	2092 ret = FAIL;
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	2093 goto theend;
ec1717981acf patch 8.1.1895: using NULL pointer when out of memory Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	2094 }
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2095 cend = newp + sumsize;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2096 *cend = 0;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2097
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2098 /*
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2099 * 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	2100 * 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	2101 *
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2102 * 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	2103 * 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	2104 * 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	2105 */
20583 d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20237 diff changeset	2106 #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	2107 props_remaining = propcount;
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20237 diff changeset	2108 #endif
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2109 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	2110 {
15326 fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting Bram Moolenaar <Bram@vim.org> parents: 15062 diff changeset	2111 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	2112
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2113 cend -= currsize;
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2114 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	2115
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2116 if (spaces[t] > 0)
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2117 {
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2118 cend -= spaces[t];
6929 e55929fca0cf patch 7.4.783 Bram Moolenaar <bram@vim.org> parents: 6927 diff changeset	2119 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	2120 }
15326 fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting Bram Moolenaar <Bram@vim.org> parents: 15062 diff changeset	2121
fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting Bram Moolenaar <Bram@vim.org> parents: 15062 diff changeset	2122 // 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	2123 // 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	2124 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	2125
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2126 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, -t,
15326 fe428bee74b3 patch 8.1.0671: cursor in the wrong column after auto-formatting Bram Moolenaar <Bram@vim.org> parents: 15062 diff changeset	2127 (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	2128 #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	2129 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	2130 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	2131 (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	2132 #endif
d067be761cd7 patch 8.2.0845: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20237 diff changeset	2133
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2134 if (t == 0)
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2135 break;
2597 c3b5d3fe9404 updated for version 7.3.020 Bram Moolenaar <bram@vim.org> parents: 2451 diff changeset	2136 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	2137 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2138 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	2139 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	2140 curr = skipwhite(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2141 currsize = (int)STRLEN(curr);
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2142 }
16678 6f453673eb19 patch 8.1.1341: text properties are lost when joining lines Bram Moolenaar <Bram@vim.org> parents: 16429 diff changeset	2143
20655 707b21559848 patch 8.2.0881: compiler warning for argument type Bram Moolenaar <Bram@vim.org> parents: 20613 diff changeset	2144 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	2145
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	2146 if (setmark && (cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
5848 75f222d67cea updated for version 7.4.267 Bram Moolenaar <bram@vim.org> parents: 5828 diff changeset	2147 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2148 // Set the '] mark.
5848 75f222d67cea updated for version 7.4.267 Bram Moolenaar <bram@vim.org> parents: 5828 diff changeset	2149 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	2150 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	2151 }
5664 647e6bb15aa3 updated for version 7.4.178 Bram Moolenaar <bram@vim.org> parents: 5596 diff changeset	2152
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2153 // 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	2154 // the deleted line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2155 changed_lines(curwin->w_cursor.lnum, currsize,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2156 curwin->w_cursor.lnum + 1, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2157 /*
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2158 * Delete following lines. To do this we move the cursor there
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2159 * briefly, and then move it back. After del_lines() the cursor may
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2160 * have moved up (last line deleted), so the current lnum is kept in t.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2161 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2162 t = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2163 ++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	2164 del_lines(count - 1, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2165 curwin->w_cursor.lnum = t;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2166
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2167 /*
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2168 * Set the cursor column:
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2169 * 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	2170 * vim: use the column of the last join
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2171 */
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2172 curwin->w_cursor.col =
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2173 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2174 check_cursor_col();
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2175
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2176 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2177 curwin->w_set_curswant = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2178
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2179 theend:
2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2180 vim_free(spaces);
3562 5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2181 if (remove_comments)
5c1aaf9b4b1b updated for version 7.3.541 Bram Moolenaar <bram@vim.org> parents: 3510 diff changeset	2182 vim_free(comments);
2294 2209060c340d Make joining a range of lines much faster. (Milan Vancura) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2183 return ret;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2184 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2185
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2186 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2187 * prepare a few things for block mode yank/delete/tilde
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2188 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2189 * for delete:
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2190 * - textlen includes the first/last char to be (partly) deleted
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2191 * - start/endspaces is the number of columns that are taken by the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2192 * 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	2193 * deleted.
df7ceb64b0c6 updated for version 7.2-137 vimboss parents: 1766 diff changeset	2194 * for yank and tilde:
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2195 * - textlen includes the first/last char to be wholly yanked
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2196 * - start/endspaces is the number of columns of the first/last yanked char
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2197 * that are to be yanked.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2198 */
18164 f57481564f2c patch 8.1.2077: the ops.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18100 diff changeset	2199 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2200 block_prep(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2201 oparg_T *oap,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2202 struct block_def *bdp,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2203 linenr_T lnum,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2204 int is_del)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2205 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2206 int incr = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2207 char_u *pend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2208 char_u *pstart;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2209 char_u *line;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2210 char_u *prev_pstart;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2211 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	2212 #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	2213 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	2214
be81baeb69f8 patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set Bram Moolenaar <Bram@vim.org> parents: 19005 diff changeset	2215 // 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	2216 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	2217 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2218 bdp->startspaces = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2219 bdp->endspaces = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2220 bdp->textlen = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2221 bdp->start_vcol = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2222 bdp->end_vcol = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2223 bdp->is_short = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2224 bdp->is_oneChar = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2225 bdp->pre_whitesp = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2226 bdp->pre_whitesp_c = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2227 bdp->end_char_vcols = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2228 bdp->start_char_vcols = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2229
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2230 line = ml_get(lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2231 pstart = line;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2232 prev_pstart = line;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2233 while (bdp->start_vcol < oap->start_vcol && *pstart)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2234 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2235 // Count a tab for what it's worth (if list mode not on)
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2236 incr = lbr_chartabsize(line, pstart, bdp->start_vcol);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2237 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	2238 if (VIM_ISWHITE(*pstart))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2239 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2240 bdp->pre_whitesp += incr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2241 bdp->pre_whitesp_c++;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2242 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2243 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2244 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2245 bdp->pre_whitesp = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2246 bdp->pre_whitesp_c = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2247 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2248 prev_pstart = pstart;
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2249 MB_PTR_ADV(pstart);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2250 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2251 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	2252 if (bdp->start_vcol < oap->start_vcol) // line too short
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2253 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2254 bdp->end_vcol = bdp->start_vcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2255 bdp->is_short = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2256 if (!is_del \|\| oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2257 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2258 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2259 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2260 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2261 // 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	2262 // spaces, too.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2263 bdp->startspaces = bdp->start_vcol - oap->start_vcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2264 if (is_del && bdp->startspaces)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2265 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2266 pend = pstart;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2267 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	2268 if (bdp->end_vcol > oap->end_vcol) // it's all in one character
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2269 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2270 bdp->is_oneChar = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2271 if (oap->op_type == OP_INSERT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2272 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2273 else if (oap->op_type == OP_APPEND)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2274 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2275 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2276 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2277 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2278 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2279 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2280 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2281 if (is_del && oap->op_type != OP_LSHIFT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2282 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2283 // 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	2284 // 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	2285 // so we have to split the tab in two
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2286 bdp->startspaces = bdp->start_char_vcols
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2287 - (bdp->start_vcol - oap->start_vcol);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2288 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2289 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2290 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2291 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2292 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2293 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2294 prev_pend = pend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2295 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2296 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2297 // Count a tab for what it's worth (if list mode not on)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2298 prev_pend = pend;
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2299 incr = lbr_chartabsize_adv(line, &pend, bdp->end_vcol);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2300 bdp->end_vcol += incr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2301 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2302 if (bdp->end_vcol <= oap->end_vcol
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2303 && (!is_del
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2304 \|\| 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	2305 \|\| oap->op_type == OP_REPLACE)) // line too short
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2306 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2307 bdp->is_short = TRUE;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2308 // 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	2309 // 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	2310 // 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	2311 // if (!is_del \|\| oap->op_type == OP_APPEND)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2312 if (oap->op_type == OP_APPEND \|\| virtual_op)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2313 bdp->endspaces = oap->end_vcol - bdp->end_vcol
593 d220eb88e4e4 updated for version 7.0168 vimboss parents: 557 diff changeset	2314 + oap->inclusive;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2315 else
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2316 bdp->endspaces = 0; // replace doesn't add characters
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2317 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2318 else if (bdp->end_vcol > oap->end_vcol)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2319 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2320 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2321 if (!is_del && bdp->endspaces)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2322 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2323 bdp->endspaces = incr - bdp->endspaces;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2324 if (pend != pstart)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2325 pend = prev_pend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2326 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2327 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2328 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2329 bdp->end_char_vcols = incr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2330 if (is_del && bdp->startspaces)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2331 pstart = prev_pstart;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2332 bdp->textlen = (int)(pend - pstart);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2333 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2334 bdp->textcol = (colnr_T) (pstart - line);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2335 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	2336 #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	2337 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	2338 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2339 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2340
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2341 /*
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2342 * Handle the add/subtract operator.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2343 */
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2344 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2345 op_addsub(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2346 oparg_T *oap,
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2347 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	2348 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	2349 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2350 pos_T pos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2351 struct block_def bd;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2352 int change_cnt = 0;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2353 linenr_T amount = Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2354
15048 73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2355 // 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	2356 // 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	2357 // 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	2358 #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	2359 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	2360 #endif
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2361
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2362 if (!VIsual_active)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2363 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2364 pos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2365 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	2366 {
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2367 #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	2368 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	2369 #endif
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2370 return;
15048 73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2371 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2372 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	2373 #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	2374 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	2375 #endif
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2376 if (change_cnt)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2377 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	2378 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2379 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2380 {
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2381 int one_change;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2382 int length;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2383 pos_T startpos;
7574 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 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	2386 (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	2387 {
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2388 #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	2389 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	2390 #endif
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2391 return;
15048 73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2392 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2393
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2394 pos = oap->start;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2395 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	2396 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2397 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	2398 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2399 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	2400 pos.col = bd.textcol;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2401 length = bd.textlen;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2402 }
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2403 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	2404 {
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2405 curwin->w_cursor.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2406 pos.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2407 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	2408 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2409 else // oap->motion_type == MCHAR
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2410 {
12996 973a0037f4c3 patch 8.0.1374: CTRL-A does not work with an empty line Christian Brabandt <cb@256bit.org> parents: 12642 diff changeset	2411 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	2412 dec(&(oap->end));
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2413 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	2414 pos.col = 0;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2415 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	2416 {
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2417 pos.col += oap->start.col;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2418 length -= oap->start.col;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2419 }
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2420 if (pos.lnum == oap->end.lnum)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2421 {
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2422 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	2423 if (oap->end.col >= length)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2424 oap->end.col = length - 1;
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2425 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	2426 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2427 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2428 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	2429 if (one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2430 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2431 // 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	2432 if (change_cnt == 0)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2433 startpos = curbuf->b_op_start;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2434 ++change_cnt;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2435 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2436
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2437 #ifdef FEAT_NETBEANS_INTG
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2438 if (netbeans_active() && one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2439 {
24756 ac7ad168caed patch 8.2.2916: operators are not fully tested Bram Moolenaar <Bram@vim.org> parents: 24665 diff changeset	2440 char_u *ptr;
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2441
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2442 netbeans_removed(curbuf, pos.lnum, pos.col, (long)length);
24756 ac7ad168caed patch 8.2.2916: operators are not fully tested Bram Moolenaar <Bram@vim.org> parents: 24665 diff changeset	2443 ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2444 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	2445 &ptr[pos.col], length);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2446 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2447 #endif
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2448 if (g_cmd && one_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2449 amount += Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2450 }
15048 73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2451
73f59cd01ba7 patch 8.1.0535: increment/decrement might get interrupted by updating folds Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2452 #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	2453 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	2454 #endif
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2455 if (change_cnt)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2456 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	2457
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2458 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	2459 // 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	2460 redraw_curbuf_later(INVERTED);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2461
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2462 // 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	2463 // position from do_addsub().
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	2464 if (change_cnt > 0 && (cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2465 curbuf->b_op_start = startpos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2466
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2467 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	2468 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	2469 change_cnt), change_cnt);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2470 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2471 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2472
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2473 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2474 * 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	2475 * 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	2476 *
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2477 * 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	2478 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2479 static int
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2480 do_addsub(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2481 int op_type,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2482 pos_T *pos,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2483 int length,
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2484 linenr_T Prenum1)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2485 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2486 int col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2487 char_u *buf1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2488 char_u buf2[NUMBUFLEN];
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2489 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	2490 static int hexupper = FALSE; // 0xABC
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2491 uvarnumber_T n;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2492 uvarnumber_T oldn;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2493 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2494 int c;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2495 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	2496 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	2497 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	2498 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	2499 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	2500 int do_unsigned;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2501 int firstdigit;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2502 int subtract;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2503 int negative = FALSE;
6891 f9876721bedc patch 7.4.765 Bram Moolenaar <bram@vim.org> parents: 6868 diff changeset	2504 int was_positive = TRUE;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2505 int visual = VIsual_active;
6921 1f78058351a6 patch 7.4.779 Bram Moolenaar <bram@vim.org> parents: 6919 diff changeset	2506 int did_change = FALSE;
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2507 pos_T save_cursor = curwin->w_cursor;
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2508 int maxlen = 0;
7570 4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2509 pos_T startpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2510 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	2511 colnr_T save_coladd = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2512
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	2513 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	2514 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	2515 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	2516 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	2517 do_unsigned = (vim_strchr(curbuf->b_p_nf, 'u') != NULL); // "Unsigned"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2518
20822 8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit' Bram Moolenaar <Bram@vim.org> parents: 20695 diff changeset	2519 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	2520 {
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit' Bram Moolenaar <Bram@vim.org> parents: 20695 diff changeset	2521 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	2522 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	2523 }
8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit' Bram Moolenaar <Bram@vim.org> parents: 20695 diff changeset	2524
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2525 curwin->w_cursor = *pos;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2526 ptr = ml_get(pos->lnum);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2527 col = pos->col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2528
20822 8e5f991db3b4 patch 8.2.0963: number increment/decrement does not work with 'virtualedit' Bram Moolenaar <Bram@vim.org> parents: 20695 diff changeset	2529 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	2530 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2531
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2532 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2533 * First check if we are on a hexadecimal number, after the "0x".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2534 */
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2535 if (!VIsual_active)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2536 {
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	2537 if (do_bin)
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2538 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	2539 {
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2540 --col;
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2541 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2542 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	2543 }
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2544
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 if (do_hex)
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2546 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	2547 {
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2548 --col;
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2549 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2550 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	2551 }
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2552
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	2553 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	2554 && do_hex
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2555 && ! ((col > 0
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2556 && (ptr[col] == 'X'
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2557 \|\| ptr[col] == 'x')
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2558 && ptr[col - 1] == '0'
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2559 && (!has_mbyte \|\|
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2560 !(*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	2561 && vim_isxdigit(ptr[col + 1]))))
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2562 {
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2563
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2564 // 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	2565
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2566 col = pos->col;
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2567
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2568 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	2569 {
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2570 col--;
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2571 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2572 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	2573 }
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2574 }
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2575
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	2576 if (( do_hex
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2577 && col > 0
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2578 && (ptr[col] == 'X'
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2579 \|\| ptr[col] == 'x')
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2580 && ptr[col - 1] == '0'
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2581 && (!has_mbyte \|\|
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2582 !(*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	2583 && 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	2584 ( do_bin
7447 ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2585 && col > 0
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2586 && (ptr[col] == 'B'
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2587 \|\| ptr[col] == 'b')
ad432f8f68fb commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b Christian Brabandt <cb@256bit.org> parents: 7336 diff changeset	2588 && ptr[col - 1] == '0'
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2589 && (!has_mbyte \|\|
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2590 !(*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	2591 && vim_isbdigit(ptr[col + 1])))
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2592 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2593 // Found hexadecimal or binary number, move to its start.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2594 --col;
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2595 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2596 col -= (*mb_head_off)(ptr, ptr + col);
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2597 }
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2598 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2599 {
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2600 /*
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2601 * 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	2602 */
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2603 col = pos->col;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2604
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2605 while (ptr[col] != NUL
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2606 && !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	2607 && !(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	2608 col += mb_ptr2len(ptr + col);
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2609
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2610 while (col > 0
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2611 && 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	2612 && !(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	2613 {
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2614 --col;
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2615 if (has_mbyte)
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2616 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	2617 }
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2618 }
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2619 }
9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2620
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2621 if (visual)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2622 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2623 while (ptr[col] != NUL && length > 0
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2624 && !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	2625 && !(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	2626 {
18251 c8a53c0daeed patch 8.1.2120: some MB_ macros are more complicated than necessary Bram Moolenaar <Bram@vim.org> parents: 18219 diff changeset	2627 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	2628
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2629 col += mb_len;
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2630 length -= mb_len;
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2631 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2632
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2633 if (length == 0)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2634 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2635
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2636 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	2637 && (!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	2638 && !do_unsigned)
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2639 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2640 negative = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2641 was_positive = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2642 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2643 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2644
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2645 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2646 * 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	2647 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2648 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	2649 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	2650 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2651 beep_flush();
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2652 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2653 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2654
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	2655 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	2656 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2657 // decrement or increment alphabetic character
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2658 if (op_type == OP_NR_SUB)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2659 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2660 if (CharOrd(firstdigit) < Prenum1)
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2661 {
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2662 if (isupper(firstdigit))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2663 firstdigit = 'A';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2664 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2665 firstdigit = 'a';
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2666 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2667 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2668 firstdigit -= Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2669 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2670 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2671 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2672 if (26 - CharOrd(firstdigit) - 1 < Prenum1)
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2673 {
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2674 if (isupper(firstdigit))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2675 firstdigit = 'Z';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2676 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2677 firstdigit = 'z';
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2678 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2679 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2680 firstdigit += Prenum1;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2681 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2682 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2683 if (!did_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2684 startpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2685 did_change = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2686 (void)del_char(FALSE);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2687 ins_char(firstdigit);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2688 endpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2689 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2690 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2691 else
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2692 {
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2693 pos_T save_pos;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2694 int i;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2695
9332 a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2696 if (col > 0 && ptr[col - 1] == '-'
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2697 && (!has_mbyte \|\|
a9b8f5613601 commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37 Christian Brabandt <cb@256bit.org> parents: 9307 diff changeset	2698 !(*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	2699 && !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	2700 && !do_unsigned)
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2701 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2702 // negative number
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2703 --col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2704 negative = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2705 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2706 // get the number value (unsigned)
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2707 if (visual && VIsual_mode != 'V')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2708 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	2709 ? (int)STRLEN(ptr) - col
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2710 : length);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2711
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2712 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	2713 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	2714 + (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	2715 + (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	2716 NULL, &n, maxlen, FALSE);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2717
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2718 // 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	2719 if (pre && negative)
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 ++col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2722 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2723 negative = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2724 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2725 // add or subtract
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2726 subtract = FALSE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2727 if (op_type == OP_NR_SUB)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2728 subtract ^= TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2729 if (negative)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2730 subtract ^= TRUE;
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 oldn = n;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2733 if (subtract)
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2734 n -= (uvarnumber_T)Prenum1;
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2735 else
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2736 n += (uvarnumber_T)Prenum1;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2737 // handle wraparound for decimal numbers
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2738 if (!pre)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2739 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2740 if (subtract)
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2741 {
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2742 if (n > oldn)
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2743 {
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2744 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	2745 negative ^= TRUE;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2746 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2747 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2748 else
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2749 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2750 // add
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2751 if (n < oldn)
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2752 {
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2753 n = (n ^ (uvarnumber_T)-1);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2754 negative ^= TRUE;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2755 }
6927 58d9f967ae1a patch 7.4.782 Bram Moolenaar <bram@vim.org> parents: 6923 diff changeset	2756 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2757 if (n == 0)
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2758 negative = FALSE;
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2759 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2760
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	2761 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	2762 {
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers Bram Moolenaar <Bram@vim.org> parents: 20583 diff changeset	2763 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	2764 // 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	2765 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	2766 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	2767 // 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	2768 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	2769 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	2770 }
9edb439adbea patch 8.2.0860: cannot use CTRL-A and CTRL-X on unsigned numbers Bram Moolenaar <Bram@vim.org> parents: 20583 diff changeset	2771
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2772 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	2773 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2774 // need to remove the '-'
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2775 col--;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2776 length++;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2777 }
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 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2780 * Delete the old number.
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2781 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2782 curwin->w_cursor.col = col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2783 if (!did_change)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2784 startpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2785 did_change = TRUE;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2786 todel = length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2787 c = gchar_cursor();
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2788 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2789 * 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	2790 * 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	2791 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2792 if (c == '-')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2793 --length;
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2794
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2795 save_pos = curwin->w_cursor;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2796 for (i = 0; i < todel; ++i)
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2797 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2798 if (c < 0x100 && isalpha(c))
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2799 {
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2800 if (isupper(c))
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2801 hexupper = TRUE;
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2802 else
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2803 hexupper = FALSE;
6891 f9876721bedc patch 7.4.765 Bram Moolenaar <bram@vim.org> parents: 6868 diff changeset	2804 }
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2805 inc_cursor();
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2806 c = gchar_cursor();
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2807 }
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2808 curwin->w_cursor = save_pos;
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2809
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2810 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2811 * Prepare the leading characters in buf1[].
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2812 * 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	2813 * Allocate a bit too much.
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2814 */
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16714 diff changeset	2815 buf1 = alloc(length + NUMBUFLEN);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2816 if (buf1 == NULL)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2817 goto theend;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2818 ptr = buf1;
8989 e600e696c0a1 commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8 Christian Brabandt <cb@256bit.org> parents: 8863 diff changeset	2819 if (negative && (!visual \|\| was_positive))
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2820 *ptr++ = '-';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2821 if (pre)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2822 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2823 *ptr++ = '0';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2824 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2825 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2826 if (pre == 'b' \|\| pre == 'B' \|\|
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2827 pre == 'x' \|\| pre == 'X')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2828 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2829 *ptr++ = pre;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2830 --length;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2831 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2832
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2833 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2834 * Put the number characters in buf2[].
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2835 */
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2836 if (pre == 'b' \|\| pre == 'B')
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2837 {
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2838 int bit = 0;
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2839 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	2840
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2841 // leading zeros
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2842 for (bit = bits; bit > 0; bit--)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2843 if ((n >> (bit - 1)) & 0x1) break;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2844
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2845 for (i = 0; bit > 0; bit--)
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2846 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	2847
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2848 buf2[i] = '\0';
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2849 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2850 else if (pre == 0)
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2851 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", n);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2852 else if (pre == '0')
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2853 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", n);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2854 else if (pre && hexupper)
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2855 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", n);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2856 else
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	2857 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", n);
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2858 length -= (int)STRLEN(buf2);
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2859
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2860 /*
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2861 * 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	2862 * 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	2863 * Don't do this when
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2864 * 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	2865 */
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	2866 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	2867 while (length-- > 0)
6868 9798a98a1583 patch 7.4.754 Bram Moolenaar <bram@vim.org> parents: 6845 diff changeset	2868 *ptr++ = '0';
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2869 *ptr = NUL;
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2870
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2871 STRCAT(buf1, buf2);
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2872
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2873 // Insert just after the first character to be removed, so that any
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2874 // text properties will be adjusted. Then delete the old number
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2875 // afterwards.
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2876 save_pos = curwin->w_cursor;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2877 if (todel > 0)
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2878 inc_cursor();
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2879 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	2880 vim_free(buf1);
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2881
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2882 // del_char() will also mark line needing displaying
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2883 if (todel > 0)
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2884 {
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2885 int bytes_after = (int)STRLEN(ml_get_curline())
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2886 - curwin->w_cursor.col;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2887
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2888 // Delete the one character before the insert.
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2889 curwin->w_cursor = save_pos;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2890 (void)del_char(FALSE);
22290 9debc021e99e patch 8.2.1694: compiler warning for loss if data Bram Moolenaar <Bram@vim.org> parents: 22282 diff changeset	2891 curwin->w_cursor.col = (colnr_T)(STRLEN(ml_get_curline())
9debc021e99e patch 8.2.1694: compiler warning for loss if data Bram Moolenaar <Bram@vim.org> parents: 22282 diff changeset	2892 - bytes_after);
22278 0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2893 --todel;
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2894 }
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2895 while (todel-- > 0)
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2896 (void)del_char(FALSE);
0416105e103b patch 8.2.1688: increment/decrement removes text property Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	2897
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2898 endpos = curwin->w_cursor;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2899 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	2900 --curwin->w_cursor.col;
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2901 }
b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2902
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	2903 if (did_change && (cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
7570 4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2904 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2905 // set the '[ and '] marks
7570 4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2906 curbuf->b_op_start = startpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2907 curbuf->b_op_end = endpos;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2908 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	2909 --curbuf->b_op_end.col;
4250ecde6009 commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece Christian Brabandt <cb@256bit.org> parents: 7551 diff changeset	2910 }
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2911
7576 e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2912 theend:
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2913 if (visual)
e008ca0e2af2 commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7 Christian Brabandt <cb@256bit.org> parents: 7574 diff changeset	2914 curwin->w_cursor = save_cursor;
8690 6a1becf4f282 commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0 Christian Brabandt <cb@256bit.org> parents: 8399 diff changeset	2915 else if (did_change)
6a1becf4f282 commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0 Christian Brabandt <cb@256bit.org> parents: 8399 diff changeset	2916 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	2917 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	2918 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	2919
7574 b872724c37db commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e Christian Brabandt <cb@256bit.org> parents: 7570 diff changeset	2920 return did_change;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2921 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2922
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2923 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2924 clear_oparg(oparg_T *oap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2925 {
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19774 diff changeset	2926 CLEAR_POINTER(oap);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2927 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2928
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2929 /*
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2930 * Count the number of bytes, characters and "words" in a line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2931 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2932 * "Words" are counted by looking for boundaries between non-space and
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2933 * space characters. (it seems to produce results that match 'wc'.)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2934 *
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2935 * 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	2936 * Char count is added to "*cc".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2937 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2938 * The function will only examine the first "limit" characters in the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2939 * line, stopping if it encounters an end-of-line (NUL byte). In that
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2940 * case, eol_size will be added to the character count to account for
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2941 * the size of the EOL character.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2942 */
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2943 static varnumber_T
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2944 line_count_info(
2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2945 char_u *line,
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2946 varnumber_T *wc,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2947 varnumber_T *cc,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2948 varnumber_T limit,
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2949 int eol_size)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2950 {
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2951 varnumber_T i;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2952 varnumber_T words = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2953 varnumber_T chars = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2954 int is_word = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2955
3626 802b1a1b275f updated for version 7.3.573 Bram Moolenaar <bram@vim.org> parents: 3584 diff changeset	2956 for (i = 0; i < limit && line[i] != NUL; )
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2957 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2958 if (is_word)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2959 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2960 if (vim_isspace(line[i]))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2961 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2962 words++;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2963 is_word = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2964 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2965 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2966 else if (!vim_isspace(line[i]))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2967 is_word = 1;
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2968 ++chars;
474 a5fcf36ef512 updated for version 7.0127 vimboss parents: 446 diff changeset	2969 i += (*mb_ptr2len)(line + i);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2970 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2971
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2972 if (is_word)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2973 words++;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2974 *wc += words;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2975
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	2976 // 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	2977 if (i < limit && line[i] == NUL)
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2978 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2979 i += eol_size;
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2980 chars += eol_size;
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2981 }
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	2982 *cc += chars;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2983 return i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2984 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2985
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2986 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2987 * Give some info about the position of the cursor (for "g CTRL-G").
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2988 * In Visual mode, give some info about the selected region. (In this case,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2989 * 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	2990 * When "dict" is not NULL store the info there instead of showing it.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2991 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2992 void
7829 2a8d6b2dd925 commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2993 cursor_pos_info(dict_T *dict)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2994 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2995 char_u *p;
274 8fa8d7964cf1 updated for version 7.0073 vimboss parents: 237 diff changeset	2996 char_u buf1[50];
8fa8d7964cf1 updated for version 7.0073 vimboss parents: 237 diff changeset	2997 char_u buf2[40];
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2998 linenr_T lnum;
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	2999 varnumber_T byte_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3000 varnumber_T bom_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3001 varnumber_T byte_count_cursor = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3002 varnumber_T char_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3003 varnumber_T char_count_cursor = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3004 varnumber_T word_count = 0;
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3005 varnumber_T word_count_cursor = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3006 int eol_size;
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3007 varnumber_T last_check = 100000L;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3008 long line_count_selected = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3009 pos_T min_pos, max_pos;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3010 oparg_T oparg;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3011 struct block_def bd;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3012
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3013 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3014 * Compute the length of the file in characters.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3015 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3016 if (curbuf->b_ml.ml_flags & ML_EMPTY)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3017 {
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3018 if (dict == NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3019 {
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15517 diff changeset	3020 msg(_(no_lines_msg));
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3021 return;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3022 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3023 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3024 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3025 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3026 if (get_fileformat(curbuf) == EOL_DOS)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3027 eol_size = 2;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3028 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3029 eol_size = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3030
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3031 if (VIsual_active)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3032 {
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11065 diff changeset	3033 if (LT_POS(VIsual, curwin->w_cursor))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3034 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3035 min_pos = VIsual;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3036 max_pos = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3037 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3038 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3039 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3040 min_pos = curwin->w_cursor;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3041 max_pos = VIsual;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3042 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3043 if (*p_sel == 'e' && max_pos.col > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3044 --max_pos.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3045
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3046 if (VIsual_mode == Ctrl_V)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3047 {
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3048 #ifdef FEAT_LINEBREAK
c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3049 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	3050 char_u * saved_w_sbr = curwin->w_p_sbr;
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3051
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3052 // Make 'sbr' empty for a moment to get the correct size.
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3053 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	3054 curwin->w_p_sbr = empty_option;
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3055 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3056 oparg.is_VIsual = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3057 oparg.block_mode = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3058 oparg.op_type = OP_NOP;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3059 getvcols(curwin, &min_pos, &max_pos,
688 bcd2edc4539e updated for version 7.0207 vimboss parents: 681 diff changeset	3060 &oparg.start_vcol, &oparg.end_vcol);
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3061 #ifdef FEAT_LINEBREAK
c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3062 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	3063 curwin->w_p_sbr = saved_w_sbr;
1866 c474f5691c0c updated for version 7.2-164 vimboss parents: 1860 diff changeset	3064 #endif
688 bcd2edc4539e updated for version 7.0207 vimboss parents: 681 diff changeset	3065 if (curwin->w_curswant == MAXCOL)
bcd2edc4539e updated for version 7.0207 vimboss parents: 681 diff changeset	3066 oparg.end_vcol = MAXCOL;
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3067 // Swap the start, end vcol if needed
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3068 if (oparg.end_vcol < oparg.start_vcol)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3069 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3070 oparg.end_vcol += oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3071 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3072 oparg.end_vcol -= oparg.start_vcol;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3073 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3074 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3075 line_count_selected = max_pos.lnum - min_pos.lnum + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3076 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3077
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3078 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3079 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3080 // Check for a CTRL-C every 100000 characters.
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3081 if (byte_count > last_check)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3082 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3083 ui_breakcheck();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3084 if (got_int)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3085 return;
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3086 last_check = byte_count + 100000L;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3087 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3088
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3089 // Do extra processing for VIsual mode.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3090 if (VIsual_active
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3091 && lnum >= min_pos.lnum && lnum <= max_pos.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3092 {
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3093 char_u *s = NULL;
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3094 long len = 0L;
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3095
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3096 switch (VIsual_mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3097 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3098 case Ctrl_V:
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3099 virtual_op = virtual_active();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3100 block_prep(&oparg, &bd, lnum, 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3101 virtual_op = MAYBE;
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3102 s = bd.textstart;
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3103 len = (long)bd.textlen;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3104 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3105 case 'V':
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3106 s = ml_get(lnum);
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3107 len = MAXCOL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3108 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3109 case 'v':
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3110 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3111 colnr_T start_col = (lnum == min_pos.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3112 ? min_pos.col : 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3113 colnr_T end_col = (lnum == max_pos.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3114 ? max_pos.col - start_col + 1 : MAXCOL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3115
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3116 s = ml_get(lnum) + start_col;
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3117 len = end_col;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3118 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3119 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3120 }
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3121 if (s != NULL)
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3122 {
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3123 byte_count_cursor += line_count_info(s, &word_count_cursor,
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3124 &char_count_cursor, len, eol_size);
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3125 if (lnum == curbuf->b_ml.ml_line_count
e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3126 && !curbuf->b_p_eol
6933 62ba356c2d4e patch 7.4.785 Bram Moolenaar <bram@vim.org> parents: 6929 diff changeset	3127 && (curbuf->b_p_bin \|\| !curbuf->b_p_fixeol)
50 90188be4861f updated for version 7.0028 vimboss parents: 45 diff changeset	3128 && (long)STRLEN(s) < len)
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3129 byte_count_cursor -= eol_size;
45 e474bae3795f updated for version 7.0027 vimboss parents: 39 diff changeset	3130 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3131 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3132 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3133 {
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3134 // In non-visual mode, check for the line the cursor is on
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3135 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3136 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3137 word_count_cursor += word_count;
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3138 char_count_cursor += char_count;
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3139 byte_count_cursor = byte_count +
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3140 line_count_info(ml_get(lnum),
6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3141 &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	3142 (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	3143 eol_size);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3144 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3145 }
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3146 // Add to the running totals
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3147 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	3148 &char_count, (varnumber_T)MAXCOL,
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3149 eol_size);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3150 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3151
18808 7982f65d8f54 patch 8.1.2392: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	3152 // 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	3153 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	3154 byte_count -= eol_size;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3155
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3156 if (dict == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3157 {
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3158 if (VIsual_active)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3159 {
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3160 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	3161 {
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3162 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	3163 &max_pos.col);
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3164 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	3165 (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	3166 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3167 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3168 buf1[0] = NUL;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3169
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3170 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	3171 && char_count == byte_count)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3172 vim_snprintf((char *)IObuff, IOSIZE,
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3173 _("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	3174 buf1, line_count_selected,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3175 (long)curbuf->b_ml.ml_line_count,
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3176 word_count_cursor,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3177 word_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3178 byte_count_cursor,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3179 byte_count);
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3180 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3181 vim_snprintf((char *)IObuff, IOSIZE,
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3182 _("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	3183 buf1, line_count_selected,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3184 (long)curbuf->b_ml.ml_line_count,
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3185 word_count_cursor,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3186 word_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3187 char_count_cursor,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3188 char_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3189 byte_count_cursor,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3190 byte_count);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3191 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3192 else
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3193 {
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3194 p = ml_get_curline();
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3195 validate_virtcol();
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3196 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	3197 (int)curwin->w_virtcol + 1);
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3198 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	3199 linetabsize(p));
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3200
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3201 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	3202 && char_count == byte_count)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3203 vim_snprintf((char *)IObuff, IOSIZE,
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3204 _("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	3205 (char )buf1, (char )buf2,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3206 (long)curwin->w_cursor.lnum,
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3207 (long)curbuf->b_ml.ml_line_count,
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3208 word_count_cursor, word_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3209 byte_count_cursor, byte_count);
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3210 else
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3211 vim_snprintf((char *)IObuff, IOSIZE,
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 9332 diff changeset	3212 _("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	3213 (char )buf1, (char )buf2,
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3214 (long)curwin->w_cursor.lnum,
161 6df0106fc595 updated for version 7.0049 vimboss parents: 140 diff changeset	3215 (long)curbuf->b_ml.ml_line_count,
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3216 word_count_cursor, word_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3217 char_count_cursor, char_count,
41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3218 byte_count_cursor, byte_count);
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3219 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3220 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3221
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3222 bom_count = bomb_size();
18062 0b351691071c patch 8.1.2026: possibly using uninitialized memory Bram Moolenaar <Bram@vim.org> parents: 17797 diff changeset	3223 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	3224 {
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf() Bram Moolenaar <Bram@vim.org> parents: 18914 diff changeset	3225 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	3226
53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf() Bram Moolenaar <Bram@vim.org> parents: 18914 diff changeset	3227 vim_snprintf((char *)IObuff + len, IOSIZE - len,
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27263 diff changeset	3228 _("(+%lld for BOM)"), bom_count);
19005 53088656f5ed patch 8.2.0063: wrong size argument to vim_snprintf() Bram Moolenaar <Bram@vim.org> parents: 18914 diff changeset	3229 }
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3230 if (dict == NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3231 {
18062 0b351691071c patch 8.1.2026: possibly using uninitialized memory Bram Moolenaar <Bram@vim.org> parents: 17797 diff changeset	3232 // 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	3233 p = p_shm;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3234 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	3235 msg((char *)IObuff);
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3236 p_shm = p;
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3237 }
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3238 }
7484 1fe988587423 commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991 Christian Brabandt <cb@256bit.org> parents: 7480 diff changeset	3239 #if defined(FEAT_EVAL)
7480 a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3240 if (dict != NULL)
a49163681559 commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e Christian Brabandt <cb@256bit.org> parents: 7447 diff changeset	3241 {
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14216 diff changeset	3242 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	3243 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	3244 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	3245 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	3246 byte_count_cursor);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14216 diff changeset	3247 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	3248 char_count_cursor);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14216 diff changeset	3249 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	3250 word_count_cursor);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3251 }
7484 1fe988587423 commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991 Christian Brabandt <cb@256bit.org> parents: 7480 diff changeset	3252 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3253 }
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3254
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3255 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3256 * 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	3257 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3258 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3259 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	3260 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3261 stuffcharReadbuff(':');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3262 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	3263 stuffReadbuff((char_u *)"'<,'>");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3264 else
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 // 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	3267 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	3268 stuffcharReadbuff('.');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3269 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3270 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	3271 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	3272 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3273 stuffcharReadbuff(',');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3274 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	3275 stuffcharReadbuff('.');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3276 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	3277 stuffcharReadbuff('$');
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3278 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	3279 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3280 stuffReadbuff((char_u *)".+");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3281 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	3282 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3283 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3284 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	3285 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3286 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3287 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	3288 stuffReadbuff((char_u *)"!");
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3289 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	3290 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3291 #ifndef FEAT_CINDENT
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3292 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	3293 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	3294 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3295 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3296 stuffReadbuff(get_equalprg());
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3297 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	3298 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3299 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	3300 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3301 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	3302 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	3303 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	3304 stuffReadbuff(p_fp);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3305 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3306 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	3307 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	3308 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3309
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3310 // 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	3311 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3312
26175 6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3313 // callback function for 'operatorfunc'
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3314 static callback_T opfunc_cb;
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3315
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3316 /*
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3317 * Process the 'operatorfunc' option value.
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3318 * Returns OK or FAIL.
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3319 */
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3320 int
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3321 set_operatorfunc_option(void)
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3322 {
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3323 return option_set_callback_func(p_opfunc, &opfunc_cb);
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3324 }
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3325
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3326 #if defined(EXITFREE) \|\| defined(PROTO)
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3327 void
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3328 free_operatorfunc_option(void)
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3329 {
26518 13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3330 # ifdef FEAT_EVAL
26175 6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3331 free_callback(&opfunc_cb);
26518 13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3332 # endif
26175 6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3333 }
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3334 #endif
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3335
27018 268f6a3511df patch 8.2.4038: various code not used when features are disabled Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	3336 #if defined(FEAT_EVAL) \|\| defined(PROTO)
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3337 /*
26518 13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3338 * Mark the global 'operatorfunc' callback with 'copyID' so that it is not
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3339 * garbage collected.
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3340 */
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3341 int
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3342 set_ref_in_opfunc(int copyID UNUSED)
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3343 {
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3344 int abort = FALSE;
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3345
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3346 abort = set_ref_in_callback(&opfunc_cb, copyID);
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3347
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3348 return abort;
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3349 }
27018 268f6a3511df patch 8.2.4038: various code not used when features are disabled Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	3350 #endif
26518 13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3351
13ba00ef7687 patch 8.2.3788: lambda for option that is a function may be freed Bram Moolenaar <Bram@vim.org> parents: 26313 diff changeset	3352 /*
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3353 * 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	3354 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3355 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3356 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	3357 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3358 #ifdef FEAT_EVAL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3359 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	3360 int save_virtual_op = virtual_op;
26007 1d2e1c23e458 patch 8.2.3537: mode() does not return the right value in 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 25808 diff changeset	3361 int save_finish_op = finish_op;
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	3362 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	3363 pos_T orig_end = curbuf->b_op_end;
26175 6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3364 typval_T rettv;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3365
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3366 if (*p_opfunc == NUL)
26958 d92e0d85923f patch 8.2.4008: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26903 diff changeset	3367 emsg(_(e_operatorfunc_is_empty));
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3368 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3369 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3370 // 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	3371 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	3372 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	3373 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	3374 // 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	3375 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	3376
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3377 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	3378 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	3379 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	3380 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	3381 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	3382 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3383 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	3384 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	3385
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3386 // 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	3387 // function.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3388 virtual_op = MAYBE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3389
26007 1d2e1c23e458 patch 8.2.3537: mode() does not return the right value in 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 25808 diff changeset	3390 // Reset finish_op so that mode() returns the right value.
1d2e1c23e458 patch 8.2.3537: mode() does not return the right value in 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 25808 diff changeset	3391 finish_op = FALSE;
1d2e1c23e458 patch 8.2.3537: mode() does not return the right value in 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 25808 diff changeset	3392
26175 6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3393 if (call_callback(&opfunc_cb, 0, &rettv, 1, argv) != FAIL)
6b4f017d7005 patch 8.2.3619: cannot use a lambda for 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 26007 diff changeset	3394 clear_tv(&rettv);
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3395
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3396 virtual_op = save_virtual_op;
26007 1d2e1c23e458 patch 8.2.3537: mode() does not return the right value in 'operatorfunc' Bram Moolenaar <Bram@vim.org> parents: 25808 diff changeset	3397 finish_op = save_finish_op;
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22290 diff changeset	3398 if (cmdmod.cmod_flags & CMOD_LOCKMARKS)
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	3399 {
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18599 diff changeset	3400 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	3401 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	3402 }
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3403 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3404 #else
26958 d92e0d85923f patch 8.2.4008: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26903 diff changeset	3405 emsg(_(e_eval_feature_not_available));
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3406 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3407 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3408
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3409 /*
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3410 * 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	3411 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3412 static void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3413 get_op_vcol(
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3414 oparg_T *oap,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3415 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	3416 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	3417 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3418 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	3419
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3420 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	3421 \|\| (!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	3422 return;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3423
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3424 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	3425
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3426 // 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	3427 if (has_mbyte)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3428 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	3429
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3430 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	3431
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3432 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	3433 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3434 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	3435
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3436 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	3437 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	3438 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	3439 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3440 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	3441 && 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	3442 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	3443 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3444 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	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
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3448 // 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	3449 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	3450 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3451 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	3452 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	3453 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	3454 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	3455 ++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	3456 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3457 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	3458 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	3459 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	3460 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3461 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3462 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	3463 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	3464 // 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	3465 // 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	3466 //
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3467 // (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	3468 // positions)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3469 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	3470 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	3471 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	3472
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3473 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	3474 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	3475 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	3476 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3477
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3478 // Information for redoing the previous Visual selection.
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3479 typedef struct {
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3480 int rv_mode; // 'v', 'V', or Ctrl-V
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3481 linenr_T rv_line_count; // number of lines
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3482 colnr_T rv_vcol; // number of cols or end column
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3483 long rv_count; // count for Visual operator
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3484 int rv_arg; // extra argument
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3485 } redo_VIsual_T;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3486
27140 a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3487 static int
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3488 is_ex_cmdchar(cmdarg_T *cap)
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3489 {
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3490 return cap->cmdchar == ':'
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3491 \|\| cap->cmdchar == K_COMMAND
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3492 \|\| cap->cmdchar == K_SCRIPT_COMMAND;
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3493 }
a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3494
18219 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 * 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	3497 * "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	3498 */
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3499 void
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3500 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	3501 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3502 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	3503 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	3504 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	3505 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	3506 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3507 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	3508 #endif
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 // The visual area is remembered for redo
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3511 static redo_VIsual_T redo_VIsual = {NUL, 0, 0, 0,0};
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3512
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3513 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	3514
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3515 #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	3516 // 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	3517 // 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	3518 // 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	3519 // 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	3520 // 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	3521 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	3522 && 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	3523 && !gui_yank
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3524 && VIsual_active
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3525 && !redo_VIsual_busy
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3526 && oap->regname == 0)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3527 clip_auto_select();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3528 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3529 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	3530
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3531 // 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	3532 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	3533 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3534 // 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	3535 // for the clipboard.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3536 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	3537
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3538 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3539 // 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	3540 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	3541 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	3542 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	3543 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3544 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	3545 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	3546 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	3547 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	3548 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3549 // 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	3550 // 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	3551 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	3552 oap->inclusive = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3553 // 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	3554 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	3555 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	3556 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	3557 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3558 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	3559 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3560 // 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	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 VIsual_active = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3564 VIsual = oap->start;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3565 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3566 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	3567 VIsual_select = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3568 VIsual_reselect = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3569 }
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 // 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	3572 // 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	3573 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	3574 && ((!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	3575 // Also redo Operator-pending Visual mode mappings
22916 1fe53aae3ba0 patch 8.2.2005: redoing a mapping with <Cmd> doesn't work properly Bram Moolenaar <Bram@vim.org> parents: 22862 diff changeset	3576 \|\| (VIsual_active
27140 a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3577 && is_ex_cmdchar(cap) && oap->op_type != OP_COLON))
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3578 && cap->cmdchar != 'D'
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3579 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3580 && 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	3581 && 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	3582 && 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	3583 && 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	3584 && 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	3585 && 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	3586 && 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	3587 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3588 )
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3589 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3590 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	3591 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	3592 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	3593 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	3594 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3595 // 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	3596 // 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	3597 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	3598 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	3599 AppendToRedobuff(NL_STR);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3600 }
27140 a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3601 else if (is_ex_cmdchar(cap))
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3602 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3603 // 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	3604 // "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	3605 // 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	3606 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	3607 ResetRedobuff();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3608 else
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 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	3611 AppendToRedobuff(NL_STR);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3612 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	3613 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3614 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3615 }
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 (redo_VIsual_busy)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3618 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3619 // Redo of an operation on a Visual area. Use the same size from
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3620 // redo_VIsual.rv_line_count and redo_VIsual.rv_vcol.
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3621 oap->start = curwin->w_cursor;
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3622 curwin->w_cursor.lnum += redo_VIsual.rv_line_count - 1;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3623 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	3624 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3625 VIsual_mode = redo_VIsual.rv_mode;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3626 if (redo_VIsual.rv_vcol == MAXCOL \|\| VIsual_mode == 'v')
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3627 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3628 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	3629 {
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3630 if (redo_VIsual.rv_line_count <= 1)
18219 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 validate_virtcol();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3633 curwin->w_curswant =
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3634 curwin->w_virtcol + redo_VIsual.rv_vcol - 1;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3635 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3636 else
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3637 curwin->w_curswant = redo_VIsual.rv_vcol;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3638 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3639 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3640 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3641 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	3642 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3643 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	3644 }
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3645 cap->count0 = redo_VIsual.rv_count;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3646 if (redo_VIsual.rv_count != 0)
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3647 cap->count1 = redo_VIsual.rv_count;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3648 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3649 cap->count1 = 1;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3650 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3651 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	3652 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3653 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3654 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3655 // 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	3656 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	3657 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	3658 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	3659 restore_visual_mode();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3660 curbuf->b_visual.vi_curswant = curwin->w_curswant;
27521 3ad379c0ab28 patch 8.2.4288: preprocessor indents are inconsistent Bram Moolenaar <Bram@vim.org> parents: 27490 diff changeset	3661 #ifdef FEAT_EVAL
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3662 curbuf->b_visual_mode_eval = VIsual_mode;
27521 3ad379c0ab28 patch 8.2.4288: preprocessor indents are inconsistent Bram Moolenaar <Bram@vim.org> parents: 27490 diff changeset	3663 #endif
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3664 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3665
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3666 // 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	3667 // characterwise selection.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3668 // 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	3669 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	3670 && 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	3671 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3672 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	3673 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3674 VIsual.col = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3675 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	3676 (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	3677 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3678 else
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 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	3681 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	3682 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3683 VIsual_mode = 'v';
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3684 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3685 // 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	3686 // charwise selections.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3687 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	3688 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	3689
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3690 oap->start = VIsual;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3691 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	3692 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3693 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	3694 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	3695 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3696 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3697
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3698 // 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	3699 // 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	3700 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	3701 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3702 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3703 // 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	3704 if (!VIsual_active)
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 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	3707 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	3708 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	3709 \|\| 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	3710 && 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	3711 &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	3712 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	3713 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3714 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3715 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	3716 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	3717
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3718 // 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	3719 // 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	3720 // automatically.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3721 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	3722 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3723 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3724 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3725 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3726 // 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	3727 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	3728 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3729 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	3730 NULL))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3731 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	3732 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	3733 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	3734 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3735 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3736 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	3737 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	3738 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3739
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3740 // 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	3741 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	3742 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	3743
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3744 // 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	3745 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	3746
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3747 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	3748 {
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3749 get_op_vcol(oap, redo_VIsual.rv_vcol, TRUE);
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3750
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3751 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	3752 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3753 // 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	3754 // 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	3755 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	3756 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	3757 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	3758 else
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 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	3761 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	3762 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	3763 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	3764 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3765 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	3766 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	3767 &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	3768 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	3769 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3770 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3771 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	3772 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3773 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	3774 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3775
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3776 // 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	3777 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	3778 && 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	3779 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3780 && 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	3781 && 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	3782 && 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	3783 && 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	3784 && 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	3785 && 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	3786 && 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	3787 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3788 && 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	3789 )
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3790 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3791 // 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	3792 // 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	3793 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	3794 \|\| cap->nchar == 'N'))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3795 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	3796 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	3797 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	3798 oap->motion_force, cap->cmdchar, cap->nchar);
27140 a9eeb18e749c patch 8.2.4099: Vim9: cannot use Vim9 syntax in mapping Bram Moolenaar <Bram@vim.org> parents: 27018 diff changeset	3799 else if (!is_ex_cmdchar(cap))
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3800 {
26226 9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3801 int opchar = get_op_char(oap->op_type);
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3802 int extra_opchar = 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	3803 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	3804
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3805 // 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	3806 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	3807 nchar = CAR;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3808 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	3809 nchar = NL;
26226 9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3810
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3811 if (opchar == 'g' && extra_opchar == '@')
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3812 // also repeat the count for 'operatorfunc'
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3813 prep_redo_num2(oap->regname, 0L, NUL, 'v',
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3814 cap->count0, opchar, extra_opchar, nchar);
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3815 else
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3816 prep_redo(oap->regname, 0L, NUL, 'v',
9a8e9383e4cd patch 8.2.3644: count for 'operatorfunc' in Visual mode is not redone Bram Moolenaar <Bram@vim.org> parents: 26175 diff changeset	3817 opchar, extra_opchar, nchar);
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3818 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3819 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	3820 {
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3821 redo_VIsual.rv_mode = resel_VIsual_mode;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3822 redo_VIsual.rv_vcol = resel_VIsual_vcol;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3823 redo_VIsual.rv_line_count = resel_VIsual_line_count;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3824 redo_VIsual.rv_count = cap->count0;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	3825 redo_VIsual.rv_arg = cap->arg;
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3826 }
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
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3829 // 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	3830 // 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	3831 // 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	3832 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	3833 oap->inclusive = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3834 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	3835 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	3836 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3837 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3838 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	3839 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	3840 && (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	3841 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3842 oap->inclusive = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3843 // 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	3844 // 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	3845 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	3846 && !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	3847 && 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	3848 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3849 ++oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3850 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	3851 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	3852 ++oap->line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3853 }
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 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3856
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3857 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	3858
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3859 // 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	3860 // 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	3861 // 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	3862 // 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	3863 // part.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3864 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3865 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3866 VIsual_active = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3867 setmouse();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3868 mouse_dragging = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3869 may_clear_cmdline();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3870 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	3871 \|\| 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	3872 \|\| 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	3873 \|\| 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	3874 && 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	3875 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3876 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3877 // 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	3878 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	3879 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3880 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	3881 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3882 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3883 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3884
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3885 // 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	3886 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	3887 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3888 int l;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3889
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3890 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	3891 if (l > 1)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3892 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	3893 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3894 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	3895
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3896 // 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	3897 // 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	3898 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	3899 && (!oap->inclusive
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3900 \|\| (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	3901 && 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	3902 && 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	3903 && !(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	3904 // 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	3905 // 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	3906 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	3907 && 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	3908
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3909 // 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	3910 // '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	3911 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	3912 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3913 \|\| 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	3914 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3915 ))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3916 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3917 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3918 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	3919 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3920 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	3921 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3922
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3923 // 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	3924 // 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	3925 // 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	3926 // 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	3927 // (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	3928 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	3929 && oap->inclusive == FALSE
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3930 && !(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	3931 && 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	3932 && (!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	3933 && !oap->block_mode
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3934 && 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	3935 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3936 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	3937 --oap->line_count;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3938 --oap->end.lnum;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3939 if (inindent(0))
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3940 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	3941 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3942 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3943 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	3944 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	3945 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3946 --oap->end.col;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3947 oap->inclusive = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3948 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3949 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3950 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3951 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3952 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	3953
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3954 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	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_LSHIFT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3957 case OP_RSHIFT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3958 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	3959 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	3960 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3961
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3962 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	3963 case OP_JOIN:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3964 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	3965 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	3966 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	3967 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	3968 beep_flush();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3969 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3970 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3971 (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	3972 TRUE, TRUE, TRUE);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3973 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	3974 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3975 break;
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 case OP_DELETE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3978 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	3979 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	3980 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3981 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	3982 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3983 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3984 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3985 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3986 (void)op_delete(oap);
22965 473a1413d09b patch 8.2.2029: Coverity warns for not checking return value Bram Moolenaar <Bram@vim.org> parents: 22916 diff changeset	3987 // save cursor line for undo if it wasn't saved yet
473a1413d09b patch 8.2.2029: Coverity warns for not checking return value Bram Moolenaar <Bram@vim.org> parents: 22916 diff changeset	3988 if (oap->motion_type == MLINE && has_format_option(FO_AUTO)
473a1413d09b patch 8.2.2029: Coverity warns for not checking return value Bram Moolenaar <Bram@vim.org> parents: 22916 diff changeset	3989 && u_save_cursor() == OK)
473a1413d09b patch 8.2.2029: Coverity warns for not checking return value Bram Moolenaar <Bram@vim.org> parents: 22916 diff changeset	3990 auto_format(FALSE, TRUE);
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3991 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3992 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3993
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3994 case OP_YANK:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3995 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	3996 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	3997 if (!gui_yank)
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 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	4000 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4001 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4002 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4003 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4004 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4005 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4006 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	4007 #endif
24866 f1121eb17e14 patch 8.2.2971: cannot yank a block without trailing spaces Bram Moolenaar <Bram@vim.org> parents: 24768 diff changeset	4008 oap->excl_tr_ws = cap->cmdchar == 'z';
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4009 (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	4010 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4011 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4012 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4013
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4014 case OP_CHANGE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4015 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	4016 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	4017 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4018 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	4019 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4020 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4021 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4022 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4023 // 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	4024 // 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	4025 // 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	4026 // '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	4027 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	4028 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	4029 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4030 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	4031 restart_edit = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4032 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4033 // 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	4034 // 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	4035 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	4036 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4037 // 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	4038 finish_op = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4039 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	4040 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	4041 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	4042 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	4043 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4044 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4045
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4046 case OP_FILTER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4047 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	4048 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	4049 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4050 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	4051 // FALLTHROUGH
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4052
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4053 case OP_INDENT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4054 case OP_COLON:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4055
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4056 #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	4057 // 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	4058 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	4059 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4060 # ifdef FEAT_LISP
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4061 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	4062 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4063 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	4064 break;
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 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4067 # ifdef FEAT_CINDENT
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4068 op_reindent(oap,
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4069 # ifdef FEAT_EVAL
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4070 *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	4071 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4072 get_c_indent);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4073 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4074 # endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4075 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4076 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4077
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4078 op_colon(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4079 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4080
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4081 case OP_TILDE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4082 case OP_UPPER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4083 case OP_LOWER:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4084 case OP_ROT13:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4085 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	4086 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4087 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	4088 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4089 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4090 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4091 op_tilde(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4092 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4093 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4094
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4095 case OP_FORMAT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4096 #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	4097 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	4098 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	4099 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4100 #endif
24665 661d15592d3c patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code Bram Moolenaar <Bram@vim.org> parents: 23287 diff changeset	4101 {
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4102 if (p_fp != NUL \|\| curbuf->b_p_fp != NUL)
24665 661d15592d3c patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code Bram Moolenaar <Bram@vim.org> parents: 23287 diff changeset	4103 op_colon(oap); // use external command
661d15592d3c patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code Bram Moolenaar <Bram@vim.org> parents: 23287 diff changeset	4104 else
661d15592d3c patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code Bram Moolenaar <Bram@vim.org> parents: 23287 diff changeset	4105 op_format(oap, FALSE); // use internal function
661d15592d3c patch 8.2.2871: unnessary VIM_ISDIGIT() calls, badly indented code Bram Moolenaar <Bram@vim.org> parents: 23287 diff changeset	4106 }
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4107 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4108 case OP_FORMAT2:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4109 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	4110 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4111
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4112 case OP_FUNCTION:
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4113 {
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4114 redo_VIsual_T save_redo_VIsual = redo_VIsual;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4115
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4116 #ifdef FEAT_LINEBREAK
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4117 // Restore linebreak, so that when the user edits it looks as
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4118 // before.
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4119 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	4120 #endif
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4121 // call 'operatorfunc'
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4122 op_function(oap);
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4123
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4124 // Restore the info for redoing Visual mode, the function may
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4125 // invoke another operator and unintentionally change it.
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4126 redo_VIsual = save_redo_VIsual;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4127 break;
5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4128 }
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4129
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4130 case OP_INSERT:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4131 case OP_APPEND:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4132 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	4133 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	4134 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4135 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	4136 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4137 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4138 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4139 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4140 // 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	4141 // 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	4142 // 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	4143 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	4144 restart_edit = 0;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4145 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4146 // 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	4147 // 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	4148 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	4149 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4150 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	4151 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4152 // 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	4153 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	4154 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4155
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4156 // 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	4157 // the lines.
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4158 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	4159
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4160 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	4161 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	4162 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4163 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	4164 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4165 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4166
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4167 case OP_REPLACE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4168 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	4169 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	4170 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4171 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	4172 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4173 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4174 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4175 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4176 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4177 // 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	4178 // 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	4179 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	4180 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4181 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	4182 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4183 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4184
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4185 #ifdef FEAT_FOLDING
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4186 case OP_FOLD:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4187 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	4188 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	4189 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4190
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4191 case OP_FOLDOPEN:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4192 case OP_FOLDOPENREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4193 case OP_FOLDCLOSE:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4194 case OP_FOLDCLOSEREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4195 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	4196 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	4197 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	4198 \|\| 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	4199 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	4200 \|\| 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	4201 oap->is_VIsual);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4202 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4203
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4204 case OP_FOLDDEL:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4205 case OP_FOLDDELREC:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4206 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	4207 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	4208 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	4209 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4210 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4211 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	4212 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	4213 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	4214 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4215 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	4216 CancelRedo();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4217 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4218 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4219 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4220 VIsual_active = TRUE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4221 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4222 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	4223 #endif
26903 5aa9e8db975c patch 8.2.3980: if 'operatorfunc' invokes an operator Visual mode is changed Bram Moolenaar <Bram@vim.org> parents: 26865 diff changeset	4224 op_addsub(oap, cap->count1, redo_VIsual.rv_arg);
18219 5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4225 VIsual_active = FALSE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4226 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4227 check_cursor_col();
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4228 break;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4229 default:
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4230 clearopbeep(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4231 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4232 virtual_op = MAYBE;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4233 if (!gui_yank)
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4234 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4235 // 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	4236 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	4237 && (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	4238 \|\| 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	4239 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4240 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4241 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	4242 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4243 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	4244 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4245 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4246 else
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4247 {
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4248 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	4249 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4250 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	4251 clearop(oap);
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4252 motion_force = NUL;
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4253 }
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4254 #ifdef FEAT_LINEBREAK
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4255 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	4256 #endif
5d67f207f7c3 patch 8.1.2104: the normal.c file is too big Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	4257 }

Mercurial > vim

annotate src/ops.c @ 28773:d770568e6c98 v8.2.4911