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.

diff --git a/src/menu.c b/src/menu.c
index f07be97e74840b1eba3b3e74087fda8aaabeab09..9ed7c270ada2d7cf9e5e1c5c8b154f8a1431879e 100644 (file)
--- 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 6416490fbd472ca00f0ace7ee22ffd1ef44dd9e2..14edfe4ce3714d94437f322246306c7b9ba0a7c2 100644 (file)
--- 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,
 /**/