mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4881: "P" in Visual mode still changes some registers (#18445)

Browse Source 
Problem:    "P" in Visual mode still changes some registers.
Solution:   Make "P" in Visual mode not change any register. (Shougo
            Matsushita, closes vim/vim#10349)
509142ab7a
This commit is contained in:
zeertzjq
2022-05-06 19:26:28 +08:00
committed by GitHub
parent 8bbeab9989
commit 7978660efb
5 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/normal.c
View File

@@ -7108,7 +7108,7 @@ static void nv_put_opt(cmdarg_T *cap, bool fix_indent)
// overwrites if the old contents is being put.
was_visual = true;
regname = cap->oap->regname;
bool save_unnamed = cap->cmdchar == 'P';
bool keep_registers = cap->cmdchar == 'P';
// '+' and '*' could be the same selection
bool clipoverwrite = (regname == '+' || regname == '*') && (cb_flags & CB_UNNAMEDMASK);
if (regname == 0 || regname == '"' || clipoverwrite
@@ -7123,23 +7123,15 @@ static void nv_put_opt(cmdarg_T *cap, bool fix_indent)
// do_put(), which requires the visual selection to still be active.
if (!VIsual_active || VIsual_mode == 'V' || regname != '.') {
// Now delete the selected text. Avoid messages here.
yankreg_T *old_y_previous;
if (save_unnamed) {
old_y_previous = get_y_previous();
}
cap->cmdchar = 'd';
cap->nchar = NUL;
cap->oap->regname = NUL;
cap->oap->regname = keep_registers ? '_' : NUL;
msg_silent++;
nv_operator(cap);
do_pending_operator(cap, 0, false);
empty = (curbuf->b_ml.ml_flags & ML_EMPTY);
msg_silent--;
if (save_unnamed) {
set_y_previous(old_y_previous);
}
// delete PUT_LINE_BACKWARD;
cap->oap->regname = regname;
}

94
src/nvim/testdir/test_visual.vim
View File

@@ -1350,34 +1350,74 @@ func Test_visual_paste()
call assert_equal('x', @-)
call assert_equal('bazooxxf', getline(1))
if has('clipboard')
" v_P does not overwrite unnamed register.
call setline(1, ['xxxx'])
call setreg('"', 'foo')
call setreg('-', 'bar')
normal gg0vP
call assert_equal('foo', @")
call assert_equal('x', @-)
call assert_equal('fooxxx', getline(1))
normal $vP
call assert_equal('foo', @")
call assert_equal('x', @-)
call assert_equal('fooxxfoo', getline(1))
" Test with a different register as unnamed register.
call setline(2, ['baz'])
normal 2gg0"rD
call assert_equal('baz', @")
normal gg0vP
call assert_equal('baz', @")
call assert_equal('f', @-)
call assert_equal('bazooxxfoo', getline(1))
normal $vP
call assert_equal('baz', @")
call assert_equal('o', @-)
call assert_equal('bazooxxfobaz', getline(1))
endif
bwipe!
endfunc
func Test_visual_paste_clipboard()
CheckFeature clipboard_working
if has('gui')
" auto select feature breaks tests
set guioptions-=a
endif
" v_P does not overwrite unnamed register.
call setline(1, ['xxxx'])
call setreg('"', 'foo')
call setreg('-', 'bar')
normal gg0vP
call assert_equal('foo', @")
call assert_equal('bar', @-)
call assert_equal('fooxxx', getline(1))
normal $vP
call assert_equal('foo', @")
call assert_equal('bar', @-)
call assert_equal('fooxxfoo', getline(1))
" Test with a different register as unnamed register.
call setline(2, ['baz'])
normal 2gg0"rD
call assert_equal('baz', @")
normal gg0vP
call assert_equal('baz', @")
call assert_equal('bar', @-)
call assert_equal('bazooxxfoo', getline(1))
normal $vP
call assert_equal('baz', @")
call assert_equal('bar', @-)
call assert_equal('bazooxxfobaz', getline(1))
" Test for unnamed clipboard
set clipboard=unnamed
call setline(1, ['xxxx'])
call setreg('"', 'foo')
call setreg('-', 'bar')
call setreg('*', 'baz')
normal gg0vP
call assert_equal('foo', @")
call assert_equal('bar', @-)
call assert_equal('baz', @*)
call assert_equal('bazxxx', getline(1))
" Test for unnamedplus clipboard
if has('unnamedplus')
set clipboard=unnamedplus
call setline(1, ['xxxx'])
call setreg('"', 'foo')
call setreg('-', 'bar')
call setreg('+', 'baz')
normal gg0vP
call assert_equal('foo', @")
call assert_equal('bar', @-)
call assert_equal('baz', @+)
call assert_equal('bazxxx', getline(1))
endif
set clipboard&
if has('gui')
set guioptions&
endif
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab