forked from aniani/vim
patch 9.0.0015: with EXITFREE defined terminal menus are not cleared
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:
@@ -402,6 +402,7 @@ free_all_mem(void)
|
|||||||
# ifdef FEAT_MENU
|
# ifdef FEAT_MENU
|
||||||
// Clear menus.
|
// Clear menus.
|
||||||
do_cmdline_cmd((char_u *)"aunmenu *");
|
do_cmdline_cmd((char_u *)"aunmenu *");
|
||||||
|
do_cmdline_cmd((char_u *)"tlunmenu *");
|
||||||
# ifdef FEAT_MULTI_LANG
|
# ifdef FEAT_MULTI_LANG
|
||||||
do_cmdline_cmd((char_u *)"menutranslate clear");
|
do_cmdline_cmd((char_u *)"menutranslate clear");
|
||||||
# endif
|
# endif
|
||||||
|
@@ -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.
|
// 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;
|
idx = MENU_INDEX_NORMAL;
|
||||||
|
|
||||||
if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
|
if (menu->strings[idx] != NULL && (menu->modes & (1 << idx)))
|
||||||
&& (menu->modes & (1 << idx)))
|
|
||||||
{
|
{
|
||||||
// When executing a script or function execute the commands right now.
|
// When executing a script or function execute the commands right now.
|
||||||
// Also for the window toolbar.
|
// Also for the window toolbar.
|
||||||
|
@@ -735,6 +735,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
15,
|
||||||
/**/
|
/**/
|
||||||
14,
|
14,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user