Mercurial > vim

diff src/misc1.c @ 15398:3e02464faaac v8.1.0707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0707: text property columns are not adjusted for changed indent commit https://github.com/vim/vim/commit/663bc89bbb8158bd0888f7d7228b2dbc6bbd4802 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 8 23:07:24 2019 +0100 patch 8.1.0707: text property columns are not adjusted for changed indent Problem: Text property columns are not adjusted for changed indent. Solution: Adjust text properties.
author Bram Moolenaar <Bram@vim.org>
date Tue, 08 Jan 2019 23:15:05 +0100
parents f6b522596993
children 9171193ae720
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -411,24 +411,29 @@ set_indent(
     }
     mch_memmove(s, p, (size_t)line_len);
 
-    /* Replace the line (unless undo fails). */
+    // Replace the line (unless undo fails).
     if (!(flags & SIN_UNDO) || u_savesub(curwin->w_cursor.lnum) == OK)
     {
 	ml_replace(curwin->w_cursor.lnum, newline, FALSE);
 	if (flags & SIN_CHANGED)
 	    changed_bytes(curwin->w_cursor.lnum, 0);
-	/* Correct saved cursor position if it is in this line. */
+
+	// Correct saved cursor position if it is in this line.
 	if (saved_cursor.lnum == curwin->w_cursor.lnum)
 	{
 	    if (saved_cursor.col >= (colnr_T)(p - oldline))
-		/* cursor was after the indent, adjust for the number of
-		 * bytes added/removed */
+		// cursor was after the indent, adjust for the number of
+		// bytes added/removed
 		saved_cursor.col += ind_len - (colnr_T)(p - oldline);
 	    else if (saved_cursor.col >= (colnr_T)(s - newline))
-		/* cursor was in the indent, and is now after it, put it back
-		 * at the start of the indent (replacing spaces with TAB) */
+		// cursor was in the indent, and is now after it, put it back
+		// at the start of the indent (replacing spaces with TAB)
 		saved_cursor.col = (colnr_T)(s - newline);
 	}
+#ifdef FEAT_TEXT_PROP
+	adjust_prop_columns(curwin->w_cursor.lnum, (colnr_T)(p - oldline),
+					     ind_len - (colnr_T)(p - oldline));
+#endif
 	retval = TRUE;
     }
     else