mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 15:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1858: v:register not reset after Visual mode command (#36215)

Browse Source 
Problem:  v:register not reset after Visual mode command.
          (laktak)
Solution: Reset v:register if Visual mode was active before
          do_pending_operator() (zeertzjq)

fixes: vim/vim#18579
related: vim/vim#5305
closes: vim/vim#18583

b3b47e540d
(cherry picked from commit aeeadddac4)
This commit is contained in:
zeertzjq
2025-10-17 08:36:27 +08:00
committed by github-actions[bot]
parent f93747ee3a
commit ad172eb762
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/normal.c
View File

@@ -981,6 +981,8 @@ static void normal_finish_command(NormalState *s)
s->old_mapped_len = typebuf_maplen();
}
const bool prev_VIsual_active = VIsual_active;
// If an operation is pending, handle it. But not for K_IGNORE or
// K_MOUSEMOVE.
if (s->ca.cmdchar != K_IGNORE && s->ca.cmdchar != K_MOUSEMOVE) {
@@ -998,7 +1000,7 @@ normal_end:
msg_nowait = false;
if (finish_op) {
if (finish_op || prev_VIsual_active) {
set_reg_var(get_default_register_name());
}

12
test/old/testdir/test_registers.vim
View File

@@ -666,8 +666,13 @@ func Test_v_register()
let s:register = ''
call feedkeys('"_ddS', 'mx')
call assert_equal('test@', getline('.')) " fails before 8.2.0929
call assert_equal('"', s:register) " fails before 8.2.0929
call assert_equal('test@', getline('.')) " fails before 8.2.0929
let s:register = ''
call feedkeys('V"_dS', 'mx')
call assert_equal('"', s:register)
call assert_equal('test@', getline('.'))
let s:register = ''
call feedkeys('"zS', 'mx')
@@ -686,6 +691,11 @@ func Test_v_register()
call assert_equal('"', s:register) " fails before 8.2.0929
call assert_equal('test@', getline('.')) " fails before 8.2.0929
let s:register = ''
normal V"_dS
call assert_equal('"', s:register)
call assert_equal('test@', getline('.'))
let s:register = ''
execute 'normal "z:call' "s:Put()\n"
call assert_equal('z', s:register)