From 7812c6830cb8a600c33eec1854c97ac31e4e03fb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 29 Jan 2022 06:05:39 +0800
Subject: [PATCH] vim-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 vim/vim#8899)
https://github.com/vim/vim/commit/56858e4ed4e338e15821767b8303b06099e40384
---
 src/nvim/ops.c                | 4 ++++
 src/nvim/testdir/test_put.vim | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 52164f6c38..52c55c8de3 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3616,6 +3616,10 @@ error:
         } else {
           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 == kMTLineWise) {
         // put cursor on first non-blank in first inserted line
diff --git a/src/nvim/testdir/test_put.vim b/src/nvim/testdir/test_put.vim
index aceac58493..3b6b2e0e0d 100644
--- a/src/nvim/testdir/test_put.vim
+++ b/src/nvim/testdir/test_put.vim
@@ -116,8 +116,10 @@ func Test_gp_with_count_leaves_cursor_at_end()
   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