vim-patch:8.2.0929: v:register is not cleared after an operator was executed

Problem:    v:register is not cleared after an operator was executed.
Solution:   Clear v:register after finishing an operator (Andy Massimino,
            closes vim/vim#5305)
cc613031b9
This commit is contained in:
Jan Edmund Lazo
2020-10-29 01:51:08 -04:00
parent 026c8dde87
commit 4e24e31a6b
2 changed files with 73 additions and 0 deletions

View File

@@ -903,6 +903,10 @@ normal_end:
msg_nowait = false; msg_nowait = false;
if (finish_op) {
set_reg_var(get_default_register_name());
}
// Reset finish_op, in case it was set // Reset finish_op, in case it was set
s->c = finish_op; s->c = finish_op;
finish_op = false; finish_op = false;

View File

@@ -167,6 +167,75 @@ func Test_set_register()
enew! enew!
endfunc endfunc
func Test_v_register()
enew
call setline(1, 'nothing')
func s:Put()
let s:register = v:register
exec 'normal! "' .. v:register .. 'P'
endfunc
nnoremap <buffer> <plug>(test) :<c-u>call s:Put()<cr>
nmap <buffer> S <plug>(test)
let @z = "testz\n"
let @" = "test@\n"
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
let s:register = ''
call feedkeys('"zS', 'mx')
call assert_equal('z', s:register)
let s:register = ''
call feedkeys('"zSS', 'mx')
call assert_equal('"', s:register)
let s:register = ''
call feedkeys('"_S', 'mx')
call assert_equal('_', s:register)
let s:register = ''
normal "_ddS
call assert_equal('"', s:register) " fails before 8.2.0929
call assert_equal('test@', getline('.')) " fails before 8.2.0929
let s:register = ''
execute 'normal "z:call' "s:Put()\n"
call assert_equal('z', s:register)
call assert_equal('testz', getline('.'))
" Test operator and omap
let @b = 'testb'
func s:OpFunc(...)
let s:register2 = v:register
endfunc
set opfunc=s:OpFunc
normal "bg@l
normal S
call assert_equal('"', s:register) " fails before 8.2.0929
call assert_equal('b', s:register2)
func s:Motion()
let s:register1 = v:register
normal! l
endfunc
onoremap <buffer> Q :<c-u>call s:Motion()<cr>
normal "bg@Q
normal S
call assert_equal('"', s:register)
call assert_equal('b', s:register1)
call assert_equal('"', s:register2)
set opfunc&
bwipe!
endfunc
func Test_ve_blockpaste() func Test_ve_blockpaste()
new new
set ve=all set ve=all