patch 9.0.0050: split else-of is confusing

Problem:    Split else-of is confusing.
Solution:   Join the lines. (closes #10696)

diff --git a/src/gui.c b/src/gui.c
index d7e768f31919d091e4e76aefe703ab661bba4c1c..2275189ba6ee3a8ae7b3190cc9dbe0dd4f772313 100644 (file)
--- 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 51e33b4e3cbc73778ff6df64d0e0913b71a65778..8df43414052e14ab9e7938e453010d7f72e83026 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    50,
 /**/
     49,
 /**/