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 #10461)
diff --git a/src/change.c b/src/change.c
index 47411ca..2d01f92 100644
--- a/src/change.c
+++ b/src/change.c
@@ -1118,7 +1118,12 @@
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
index 3203305..c29c10b 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -573,6 +573,13 @@
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
index 708f4a8..ec25334 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4988,
+/**/
4987,
/**/
4986,