From 378daf87d380b9f3c4f822786dfbfdcad9ca2db9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 23 Sep 2017 23:58:28 +0200 Subject: [PATCH] patch 8.0.1142: window toolbar menu gets a tear-off item Problem: Window toolbar menu gets a tear-off item. Solution: Recognize the window toolbar. --- src/menu.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/menu.c b/src/menu.c index f07be97e7..9ed7c270a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -88,7 +88,7 @@ static const char *toolbar_names[] = static int menu_is_winbar(char_u *name) { - return (STRNCMP(name, "WinBar", 5) == 0); + return (STRNCMP(name, "WinBar", 6) == 0); } int @@ -1802,6 +1802,7 @@ menu_is_menubar(char_u *name) { return (!menu_is_popup(name) && !menu_is_toolbar(name) + && !menu_is_winbar(name) && *name != MNU_HIDDEN_CHAR); } diff --git a/src/version.c b/src/version.c index 6416490fb..14edfe4ce 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1142, /**/ 1141, /**/ -- 2.50.1