changeset 29417:1d47d224a1cc v9.0.0050

patch 9.0.0050: split else-of is confusing Commit: https://github.com/vim/vim/commit/b26592a84c8f578c8fbe83cf02ebb47453de1683 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 12 17:34:31 2022 +0100 patch 9.0.0050: split else-of is confusing Problem: Split else-of is confusing. Solution: Join the lines. (closes https://github.com/vim/vim/issues/10696)
author Bram Moolenaar <Bram@vim.org>
date Tue, 12 Jul 2022 18:45:04 +0200
parents 7149302a99e0
children eee6d731c2da
files src/gui.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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,