diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-23 23:58:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-23 23:58:28 +0200 |
| commit | 378daf87d380b9f3c4f822786dfbfdcad9ca2db9 (patch) | |
| tree | aff01af57c453062a3023b9e7a6a3f3398316798 | |
| parent | 96e7a6ee4569526c71b1e89f641526775831ac63 (diff) | |
| download | vim-git-378daf87d380b9f3c4f822786dfbfdcad9ca2db9.tar.gz | |
patch 8.0.1142: window toolbar menu gets a tear-off itemv8.0.1142
Problem: Window toolbar menu gets a tear-off item.
Solution: Recognize the window toolbar.
| -rw-r--r-- | src/menu.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1142, +/**/ 1141, /**/ 1140, |