diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-01 12:13:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-01 12:13:15 +0100 |
| commit | 79ae152697ed0dfa578cfac305d05021dec2a6bc (patch) | |
| tree | 3df65276f11979b8b35c33dcde4c2525a6d76815 | |
| parent | 9610f94510220c783328e1857af87a6ae7bc20b4 (diff) | |
patch 9.0.0015: with EXITFREE defined terminal menus are not clearedv9.0.0015
Problem: With EXITFREE defined terminal menus are not cleared.
Solution: Also clear terminal menus. Remove condition that is always true.
(closes #10641)
| -rw-r--r-- | src/alloc.c | 1 | ||||
| -rw-r--r-- | src/menu.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index 6e2a30adf2..7ca20c7189 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -402,6 +402,7 @@ free_all_mem(void) # ifdef FEAT_MENU // Clear menus. do_cmdline_cmd((char_u *)"aunmenu *"); + do_cmdline_cmd((char_u *)"tlunmenu *"); # ifdef FEAT_MULTI_LANG do_cmdline_cmd((char_u *)"menutranslate clear"); # endif diff --git a/src/menu.c b/src/menu.c index a588674226..bfad016adb 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2361,11 +2361,10 @@ execute_menu(exarg_T *eap, vimmenu_T *menu, int mode_idx) } // For the WinBar menu always use the Normal mode menu. - if (idx == -1 || eap == NULL) + if (idx == MENU_INDEX_INVALID || eap == NULL) idx = MENU_INDEX_NORMAL; - if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL - && (menu->modes & (1 << idx))) + if (menu->strings[idx] != NULL && (menu->modes & (1 << idx))) { // When executing a script or function execute the commands right now. // Also for the window toolbar. diff --git a/src/version.c b/src/version.c index 38b873bcb7..4e2389eb2f 100644 --- 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 */ /**/ + 15, +/**/ 14, /**/ 13, |