mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 05:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3644: count for 'operatorfunc' in Visual mode is not redone

Browse Source 
Problem:    Count for 'operatorfunc' in Visual mode is not redone.
Solution:   Add the count to the redo buffer. (closes vim/vim#9174)
2228cd72cf

Cherry-pick a line from patch 8.2.0522.
This commit is contained in:
zeertzjq
2022-07-05 16:40:01 +08:00
parent f42657cbcf
commit dd5fce2f5d
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/ops.c
View File

@@ -6485,6 +6485,8 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
oap->motion_force, cap->cmdchar, cap->nchar);
} else if (cap->cmdchar != ':' && cap->cmdchar != K_COMMAND) {
int opchar = get_op_char(oap->op_type);
int extra_opchar = get_extra_op_char(oap->op_type);
int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
// reverse what nv_replace() did
@@ -6493,8 +6495,13 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
} else if (nchar == REPLACE_NL_NCHAR) {
nchar = NL;
}
prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type),
get_extra_op_char(oap->op_type), nchar);
if (opchar == 'g' && extra_opchar == '@') {
// also repeat the count for 'operatorfunc'
prep_redo_num2(oap->regname, 0L, NUL, 'v', cap->count0, opchar, extra_opchar, nchar);
} else {
prep_redo(oap->regname, 0L, NUL, 'v', opchar, extra_opchar, nchar);
}
}
if (!redo_VIsual_busy) {
redo_VIsual_mode = resel_VIsual_mode;