From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 25 Oct 2019 19:49:38 +0000 (+0200)
Subject: patch 8.1.2215: unreachable code in adjusting text prop columns
X-Git-Tag: v8.1.2215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aee6876eb4a66cc9d475e30bb58c060e7d4e90e;p=vim

patch 8.1.2215: unreachable code in adjusting text prop columns

Problem:    Unreachable code in adjusting text prop columns.
Solution:   Remove the code. (Christian Brabandt)
---

diff --git a/src/textprop.c b/src/textprop.c
index cc95546e2..7029daaae 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1067,13 +1067,7 @@ adjust_prop_columns(
 	if (bytes_added > 0
 		&& (tmp_prop.tp_col >= col + (start_incl ? 2 : 1)))
 	{
-	    if (tmp_prop.tp_col < col + (start_incl ? 2 : 1))
-	    {
-		tmp_prop.tp_len += (tmp_prop.tp_col - 1 - col) + bytes_added;
-		tmp_prop.tp_col = col + 1;
-	    }
-	    else
-		tmp_prop.tp_col += bytes_added;
+	    tmp_prop.tp_col += bytes_added;
 	    // Save for undo if requested and not done yet.
 	    if ((flags & APC_SAVE_FOR_UNDO) && !dirty)
 		u_savesub(lnum);
diff --git a/src/version.c b/src/version.c
index 77ce139f8..b30faa756 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2215,
 /**/
     2214,
 /**/