From bead15f10dbdd71c0091bbfa18ec0aab9b8b2e82 Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Sun, 22 Oct 2017 18:13:46 +0800 Subject: [PATCH] vim-patch:8.0.0140 (#7428) Problem: Pasting inserted text in Visual mode does not work properly. (Matthew Malcomson) Solution: Stop Visual mode before stuffing the inserted text. (Christian Brabandt, from neovim #5709) https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0 --- src/nvim/testdir/test_visual.vim | 18 +++++++++++++----- src/nvim/version.c | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/nvim/testdir/test_visual.vim b/src/nvim/testdir/test_visual.vim index 8cb59ca32a..1694adbd32 100644 --- a/src/nvim/testdir/test_visual.vim +++ b/src/nvim/testdir/test_visual.vim @@ -1,13 +1,13 @@ -" Tests for Visual mode -if !has('multi_byte') - finish -endif - +" Tests for various Visual mode. if !has('visual') finish endif func Test_block_shift_multibyte() + " Uses double-wide character. + if !has('multi_byte') + return + endif split call setline(1, ['xヹxxx', 'ヹxxx']) exe "normal 1G0l\jl>" @@ -35,3 +35,11 @@ func Test_Visual_vapo() normal vapo bwipe! endfunc + +func Test_dotregister_paste() + new + exe "norm! ihello world\" + norm! 0ve".p + call assert_equal('hello world world', getline(1)) + q! +endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index fb3eadac3d..30ebbb22bc 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -963,7 +963,7 @@ static const int included_patches[] = { 143, 142, // 141, - // 140, + 140, // 139 NA // 138 NA 137,