aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.0.0015: with EXITFREE defined terminal menus are not cleared

Browse Source 
Problem:    With EXITFREE defined terminal menus are not cleared.
Solution:   Also clear terminal menus. Remove condition that is always true.
            (closes #10641)
This commit is contained in:
zeertzjq
2022-07-01 12:13:15 +01:00
committed by Bram Moolenaar
parent 9610f94510
commit 79ae152697
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/alloc.c
View File

@@ -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

5
src/menu.c
View File

@@ -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.

2
src/version.c
View File

@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
15,
/**/
14,
/**/