patch 8.0.0681: unnamed register only contains the last deleted text

Problem:    Unnamed register only contains the last deleted text when
            appending deleted text to a register. (Wolfgang Jeltsch)
Solution:   Only set y_previous when not using y_append. (Christian Brabandt)

diff --git a/src/ops.c b/src/ops.c
index 7cbc0c22cb8e0e9570e50c5a781bfa5093bdb059..2aec5d4383bf0e4a122b07853052eed880734d0d 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -1636,7 +1636,9 @@ shift_delete_registers()
     free_yank_all();                   /* free register nine */
     for (n = 9; n > 1; --n)
        y_regs[n] = y_regs[n - 1];
-    y_previous = y_current = &y_regs[1];
+    y_current = &y_regs[1];
+    if (!y_append)
+       y_previous = y_current;
     y_regs[1].y_array = NULL;          /* set register one to empty */
 }
 

diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim
index 38c812bc9c64fd87a2c74d9e429de46c77dd70e8..18c7f4e64d428cbe2880f8c2a8d1d7daa1672a45 100644 (file)
--- a/src/testdir/test_put.vim
+++ b/src/testdir/test_put.vim
@@ -34,3 +34,14 @@ func Test_put_char_block2()
   bw!
   call setreg('a', a[0], a[1])
 endfunc
+
+func Test_put_lines()
+  new
+  let a = [ getreg('a'), getregtype('a') ]
+  call setline(1, ['Line 1', 'Line2', 'Line 3', ''])
+  exe 'norm! gg"add"AddG""p'
+  call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1,'$'))
+  " clean up
+  bw!
+  call setreg('a', a[0], a[1])
+endfunc

diff --git a/src/version.c b/src/version.c
index 6c2d63c7d736f5b90adee1e72a4fcf5e3063b511..b06f9383ffe52375af69531829ef2acdd55877c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    681,
 /**/
     680,
 /**/