commit ef85a9b2d9e992ab594e089af3883e381cfad426
author Bram Moolenaar <Bram@vim.org> Fri Jul 10 20:24:07 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Jul 10 20:24:07 2020 +0200
tree 279b5a47466847e5f041f6a5cab5816c663385ae
parent 97d2f34c8763ab3a46c9f43284cc17bad3cf9568

patch 8.2.1170: cursor off by one with block paste while 'virtualedit' "all"

Problem:    Cursor off by one with block paste while 'virtualedit' is "all".
Solution:   Adjust condition. (Hugo Gualandi, closes #6430)

src/register.c

diff --git a/src/register.c b/src/register.c
index 9d4354a..47fcd73 100644
--- a/src/register.c
+++ b/src/register.c
@@ -1764,7 +1764,7 @@
 	{
 	    if (dir == FORWARD && c == NUL)
 		++col;
-	    if (dir != FORWARD && c != NUL)
+	    if (dir != FORWARD && c != NUL && curwin->w_cursor.coladd > 0)
 		++curwin->w_cursor.col;
 	    if (c == TAB)
 	    {

src/testdir/test_registers.vim

diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index d92ad97..242dfd4 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -659,4 +659,22 @@
   bwipe!
 endfunc
 
+func Test_ve_blockpaste()
+  new
+  set ve=all
+  0put =['QWERTZ','ASDFGH']
+  call cursor(1,1)
+  exe ":norm! \<C-V>3ljdP"
+  call assert_equal(1, col('.'))
+  call assert_equal(getline(1, 2), ['QWERTZ', 'ASDFGH'])
+  call cursor(1,1)
+  exe ":norm! \<C-V>3ljd"
+  call cursor(1,1)
+  norm! $3lP
+  call assert_equal(5, col('.'))
+  call assert_equal(getline(1, 2), ['TZ  QWER', 'GH  ASDF'])
+  set ve&vim
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/version.c

diff --git a/src/version.c b/src/version.c
index 88bd908..73d4560 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1170,
+/**/
     1169,
 /**/
     1168,