# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1653129003 -7200
# Node ID b57caac546490a6dd735c1f42f51dfa293c9fca0
# Parent  6e65441d09a55b3d06b6fcc7d1fd91aebedd004d
patch 8.2.4988: textprop in wrong position when replacing multi-byte chars

Commit: https://github.com/vim/vim/commit/0d534d9cf2ae95fc85ef7fe048d9ff590586a6a6
Author: LemonBoy <thatlemon@gmail.com>
Date:   Sat May 21 11:20:42 2022 +0100

    patch 8.2.4988: textprop in wrong position when replacing multi-byte chars

    Problem:    Textprop in wrong position when replacing multi-byte chars.
    Solution:   Adjust textprop position. (closes https://github.com/vim/vim/issues/10461)

diff --git a/src/change.c b/src/change.c
--- a/src/change.c
+++ b/src/change.c
@@ -1118,7 +1118,12 @@ ins_char_bytes(char_u *buf, int charlen)
     ml_replace(lnum, newp, FALSE);
 
     // mark the buffer as changed and prepare for displaying
-    inserted_bytes(lnum, col, newlen - oldlen);
+    changed_bytes(lnum, col);
+#ifdef FEAT_PROP_POPUP
+    if (curbuf->b_has_textprop && newlen != oldlen)
+	adjust_prop_columns(lnum, col, newlen - oldlen,
+				    State & REPLACE_FLAG ? APC_SUBSTITUTE : 0);
+#endif
 
     // If we're in Insert or Replace mode and 'showmatch' is set, then briefly
     // show the match for right parens and braces.
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -573,6 +573,13 @@ func Test_prop_replace()
   call assert_equal('yyyex xyyoxx', getline(1))
   call assert_equal(expected, prop_list(1))
 
+  " Replace three 1-byte chars with three 2-byte ones.
+  exe "normal 0l3rø"
+  call assert_equal('yøøøx xyyoxx', getline(1))
+  let expected[0].length += 3
+  let expected[1].col += 3
+  call assert_equal(expected, prop_list(1))
+
   call DeletePropTypes()
   bwipe!
   set bs&
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4988,
+/**/
     4987,
 /**/
     4986,