summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-07-12 17:34:31 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-12 17:34:31 +0100
commitb26592a84c8f578c8fbe83cf02ebb47453de1683 (patch)
treebdef7e7a8382ef7e1716eebc2c2b633fe27f25a2
parent99af91e5820c78a196c9272cd8ce5aa5be7bf374 (diff)
downloadvim-git-9.0.0050.tar.gz
patch 9.0.0050: split else-of is confusingv9.0.0050
Problem: Split else-of is confusing. Solution: Join the lines. (closes #10696)
-rw-r--r--src/gui.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui.c b/src/gui.c
index d7e768f31..2275189ba 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2131,8 +2131,7 @@ gui_outstr(char_u *s, int len)
if (this_len > len)
this_len = len; // don't include following composing char
}
- else
- if (gui.col + len > Columns)
+ else if (gui.col + len > Columns)
this_len = Columns - gui.col;
else
this_len = len;
diff --git a/src/version.c b/src/version.c
index 51e33b4e3..8df434140 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 50,
+/**/
49,
/**/
48,