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 cc95546..7029daa 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1067,13 +1067,7 @@
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 77ce139..b30faa7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2215,
+/**/
2214,
/**/
2213,