# HG changeset patch # User Bram Moolenaar # Date 1657644304 -7200 # Node ID 1d47d224a1ccb1c0bcc2946f6c3847c5a37cdcc0 # Parent 7149302a99e067f8a1e4ddef8a353310942ed86d patch 9.0.0050: split else-of is confusing Commit: https://github.com/vim/vim/commit/b26592a84c8f578c8fbe83cf02ebb47453de1683 Author: Bram Moolenaar 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) diff --git a/src/gui.c b/src/gui.c --- 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 --- 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,