# HG changeset patch # User Christian Brabandt # Date 1703015103 -3600 # Node ID 82e8284e60b79b5fcb1159859a0ac11af5157d17 # Parent 01ac9bb74f4408d2c1edf3a73e3c6c93c979c6c5 patch 9.0.2178: reg_executing() wrong for :normal with range Commit: https://github.com/vim/vim/commit/615202bd0ebc1d8e3532f24b9b7232c2fd86b181 Author: zeertzjq Date: Tue Dec 19 20:35:40 2023 +0100 patch 9.0.2178: reg_executing() wrong for :normal with range Problem: reg_executing() returns wrong result in :normal with range when 'showcmd' is set (after 8.2.4705). Solution: Reset "pending_end_reg_executing" when executing a register. closes: #13707 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt diff --git a/src/globals.h b/src/globals.h --- a/src/globals.h +++ b/src/globals.h @@ -1377,7 +1377,7 @@ EXTERN int ex_no_reprint INIT(= FALSE); EXTERN int reg_recording INIT(= 0); // register for recording or zero EXTERN int reg_executing INIT(= 0); // register being executed or zero // Flag set when peeking a character and found the end of executed register -EXTERN int pending_end_reg_executing INIT(= 0); +EXTERN int pending_end_reg_executing INIT(= FALSE); // Set when a modifyOtherKeys sequence was seen, then simplified mappings will // no longer be used. To be combined with modify_otherkeys_state. diff --git a/src/register.c b/src/register.c --- a/src/register.c +++ b/src/register.c @@ -703,6 +703,7 @@ do_execreg( return FAIL; } reg_executing = regname == 0 ? '"' : regname; // disable "q" command + pending_end_reg_executing = FALSE; } return retval; } diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim --- a/src/testdir/test_registers.vim +++ b/src/testdir/test_registers.vim @@ -840,6 +840,23 @@ func Test_end_reg_executing() bwipe! endfunc +func Test_reg_executing_in_range_normal() + new + set showcmd + call setline(1, range(10)) + let g:log = [] + nnoremap s let g:log += [reg_executing()] + let @r = 's' + + %normal @r + call assert_equal(repeat(['r'], 10), g:log) + + nunmap s + unlet g:log + set showcmd& + bwipe! +endfunc + " An operator-pending mode mapping shouldn't be applied to keys typed in " Insert mode immediately after a character search when replaying. func Test_replay_charsearch_omap() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2178, +/**/ 2177, /**/ 2176,