From 18d90b95c49d9ff1c635dd762864022aab8e71f1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 27 Jun 2017 15:39:14 +0200 Subject: [PATCH] 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) --- src/ops.c | 4 +++- src/testdir/test_put.vim | 11 +++++++++++ src/version.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ops.c b/src/ops.c index 7cbc0c22c..2aec5d438 100644 --- 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 38c812bc9..18c7f4e64 100644 --- 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 6c2d63c7d..b06f9383f 100644 --- 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, /**/ -- 2.50.1