diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-25 21:49:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-25 21:49:38 +0200 |
| commit | 7aee6876eb4a66cc9d475e30bb58c060e7d4e90e (patch) | |
| tree | a91b20c5263a7180a0448d0c261133eb4da72f67 | |
| parent | 11a58af66fa5c442f0a22c5d59beabf187ed4e89 (diff) | |
| download | vim-git-7aee6876eb4a66cc9d475e30bb58c060e7d4e90e.tar.gz | |
patch 8.1.2215: unreachable code in adjusting text prop columnsv8.1.2215
Problem: Unreachable code in adjusting text prop columns.
Solution: Remove the code. (Christian Brabandt)
| -rw-r--r-- | src/textprop.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 7 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2215, +/**/ 2214, /**/ 2213, |