From a31e7523f49c351045aed88f289d231cc7e679d1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 26 Nov 2021 12:16:04 +0100
Subject: vim-patch:8.2.3677: after a put the '] mark is on the last byte
 (#16442)

Problem:    After a put the '] mark is on the last byte of a multi-byte
            character.
Solution:   Move it to the first byte. (closes vim/vim#9047)
https://github.com/vim/vim/commit/4d07253a485819b3a9fd923d263e722ea2109c12
---
 src/nvim/ops.c                | 17 ++++++++++++++---
 src/nvim/testdir/test_put.vim | 13 +++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index b4b9545daf..cbfed5daa5 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3340,6 +3340,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
     if (y_type == kMTCharWise && y_size == 1) {
       linenr_T end_lnum = 0;  // init for gcc
       linenr_T start_lnum = lnum;
+      int first_byte_off = 0;
 
       if (VIsual_active) {
         end_lnum = curbuf->b_visual.vi_end.lnum;
@@ -3386,6 +3387,10 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
           }
           STRMOVE(ptr, oldp + col);
           ml_replace(lnum, newp, false);
+
+          // compute the byte offset for the last character
+          first_byte_off = utf_head_off(newp, ptr - 1);
+
           // Place cursor on last putted char.
           if (lnum == curwin->w_cursor.lnum) {
             // make sure curwin->w_virtcol is updated
@@ -3405,10 +3410,15 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
         lnum--;
       }
 
+      // put '] at the first byte of the last character
       curbuf->b_op_end = curwin->w_cursor;
+      curbuf->b_op_end.col -= first_byte_off;
+
       // For "CTRL-O p" in Insert mode, put cursor after last char
       if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) {
         curwin->w_cursor.col++;
+      } else {
+        curwin->w_cursor.col -= first_byte_off;
       }
     } else {
       // Insert at least one line.  When y_type is kMTCharWise, break the first
@@ -3520,12 +3530,13 @@ error:
                       curbuf->b_op_start.lnum, nr_lines, true);
       }
 
-      // put '] mark at last inserted character
+      // Put the '] mark on the first byte of the last inserted character.
+      // Correct the length for change in indent.
       curbuf->b_op_end.lnum = lnum;
-      // correct length for change in indent
       col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff;
       if (col > 1) {
-        curbuf->b_op_end.col = col - 1;
+        curbuf->b_op_end.col = col - 1 - utf_head_off(y_array[y_size - 1],
+                                                      y_array[y_size - 1] + col - 1);
       } else {
         curbuf->b_op_end.col = 0;
       }
diff --git a/src/nvim/testdir/test_put.vim b/src/nvim/testdir/test_put.vim
index 15745d5619..8d8cc77025 100644
--- a/src/nvim/testdir/test_put.vim
+++ b/src/nvim/testdir/test_put.vim
@@ -111,3 +111,16 @@ func Test_put_p_indent_visual()
   call assert_equal('select that text', getline(2))
   bwipe!
 endfunc
+
+func Test_multibyte_op_end_mark()
+   new
+   call setline(1, 'тест')
+   normal viwdp
+   call assert_equal([0, 1, 7, 0], getpos("'>"))
+   call assert_equal([0, 1, 7, 0], getpos("']"))
+
+   normal Vyp
+   call assert_equal([0, 1, 2147483647, 0], getpos("'>"))
+   call assert_equal([0, 2, 7, 0], getpos("']"))
+   bwipe!
+ endfunc
-- 
cgit