patch 8.2.3455: using a count with "gp" leaves '] in wrong position
Problem: Using a count with "gp" leaves '] in wrong position. (Naohiro Ono)
Solution: Correct the mark position. (closes #8899)
diff --git a/src/register.c b/src/register.c
index 3ddacb8..f034c64 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2205,6 +2205,9 @@
{
curwin->w_cursor.lnum = new_lnum;
curwin->w_cursor.col = col;
+ curbuf->b_op_end = curwin->w_cursor;
+ if (col > 1)
+ curbuf->b_op_end.col = col - 1;
}
}
else if (y_type == MLINE)
diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim
index f034336..f3a320f 100644
--- a/src/testdir/test_put.vim
+++ b/src/testdir/test_put.vim
@@ -126,8 +126,10 @@
new
call setline(1, '<---->')
call setreg('@', "foo\nbar", 'c')
- exe "normal 1G3|3gpix\<Esc>"
- call assert_equal(['<--foo', 'barfoo', 'barfoo', 'barx-->'], getline(1, '$'))
+ normal 1G3|3gp
+ call assert_equal([0, 4, 4, 0], getpos("."))
+ call assert_equal(['<--foo', 'barfoo', 'barfoo', 'bar-->'], getline(1, '$'))
+ call assert_equal([0, 4, 3, 0], getpos("']"))
bwipe!
endfunc
diff --git a/src/version.c b/src/version.c
index fb36b14..6865fa5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3455,
+/**/
3454,
/**/
3453,