Mercurial > vim

diff src/textprop.c @ 22331:0271c2b8bb35 v8.2.1714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 20 Sep 2020 21:15:04 +0200
parents 9d3dfd420a45
children b545334ae654
line wrap: on
line diff
--- 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