summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 d7e768f319..2275189ba6 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 51e33b4e3c..8df4341405 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,