Mercurial > vim

diff src/edit.c @ 19045:143d44d8f477 v8.2.0083

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0083: text properties wrong when tabs and spaces are exchanged Commit: https://github.com/vim/vim/commit/5cb0b93d52fa5c12ca50a18509947ee6459bb7a8 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 3 21:25:59 2020 +0100 patch 8.2.0083: text properties wrong when tabs and spaces are exchanged Problem: Text properties wrong when tabs and spaces are exchanged. Solution: Take text properties into account. (Nobuhiro Takasaki, closes #5427)
author Bram Moolenaar <Bram@vim.org>
date Fri, 03 Jan 2020 21:30:14 +0100
parents 3a68dc2a1bc1
children bcbc9fe665b5
line wrap: on
line diff
--- a/src/edit.c
+++ b/src/edit.c
@@ -5601,14 +5601,20 @@ ins_tab(void)
 	    i = cursor->col - fpos.col;
 	    if (i > 0)
 	    {
-		STRMOVE(ptr, ptr + i);
+#ifdef FEAT_PROP_POPUP
+		if (!(State & VREPLACE_FLAG))
+		{
+		    mch_memmove(ptr, ptr + i, curbuf->b_ml.ml_line_len - i
+					   - (ptr - curbuf->b_ml.ml_line_ptr));
+		    curbuf->b_ml.ml_line_len -= i;
+		}
+		else
+#endif
+		    STRMOVE(ptr, ptr + i);
 		// correct replace stack.
 		if ((State & REPLACE_FLAG) && !(State & VREPLACE_FLAG))
 		    for (temp = i; --temp >= 0; )
 			replace_join(repl_off);
-#ifdef FEAT_PROP_POPUP
-		curbuf->b_ml.ml_line_len -= i;
-#endif
 	    }
 #ifdef FEAT_NETBEANS_INTG
 	    if (netbeans_active())