# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1600629304 -7200
# Node ID 0271c2b8bb35b1fcb5aab48df98a4ffc27656381
# Parent  ca6d4f7199a9c0166eff8e0d28050d334970d9e4
patch 8.2.1714: text properties corrupted with substitute command

Commit: https://github.com/vim/vim/commit/8902b31f1b31c117915defc23ac45cdc1f5c671b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Sep 20 21:04:35 2020 +0200

    patch 8.2.1714: text properties corrupted with substitute command

    Problem:    Text properties corrupted with substitute command. (Filipe
                Brandenburger)
    Solution:   Get the changed line again after using u_savesub(). (closes #6984)

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
@@ -1132,6 +1132,19 @@ func Test_proptype_substitute2()
   bwipe!
 endfunc
 
+" This was causing property corruption.
+func Test_proptype_substitute3()
+  new
+  call setline(1, ['abcxxx', 'def'])
+  call prop_type_add("test", {"highlight": "Search"})
+  call prop_add(1, 2, {"end_lnum": 2, "end_col": 2, "type": "test"})
+  %s/x\+$//
+  redraw
+
+  call prop_type_delete('test')
+  bwipe!
+endfunc
+
 func SaveOptions()
   let d = #{tabstop: &tabstop,
 	  \ softtabstop: &softtabstop,
diff --git a/src/textprop.c b/src/textprop.c
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1349,6 +1349,10 @@ adjust_prop_columns(
 						    && u_savesub(lnum) == FAIL)
 		return FALSE;
 	    dirty = TRUE;
+
+	    // u_savesub() may have updated curbuf->b_ml, fetch it again
+	    if (curbuf->b_ml.ml_line_lnum != lnum)
+		proplen = get_text_props(curbuf, lnum, &props, TRUE);
 	}
 	if (res.can_drop)
 	    continue; // Drop this text property
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1714,
+/**/
     1713,
 /**/
     1712,