Skip to content

Commit 7aee687

Browse files
committed
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)
1 parent 11a58af commit 7aee687

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

src/textprop.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,13 +1067,7 @@ adjust_prop_columns(
10671067
if (bytes_added > 0
10681068
&& (tmp_prop.tp_col >= col + (start_incl ? 2 : 1)))
10691069
{
1070-
if (tmp_prop.tp_col < col + (start_incl ? 2 : 1))
1071-
{
1072-
tmp_prop.tp_len += (tmp_prop.tp_col - 1 - col) + bytes_added;
1073-
tmp_prop.tp_col = col + 1;
1074-
}
1075-
else
1076-
tmp_prop.tp_col += bytes_added;
1070+
tmp_prop.tp_col += bytes_added;
10771071
// Save for undo if requested and not done yet.
10781072
if ((flags & APC_SAVE_FOR_UNDO) && !dirty)
10791073
u_savesub(lnum);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
2215,
744746
/**/
745747
2214,
746748
/**/

0 commit comments

Comments
 (0)