thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0695: internal error when using :popup

Browse Source 
Problem:    Internal error when using :popup.
Solution:   When a menu only exists in Terminal mode give an error. (Naruhiko
            Nishino, closes #3765)
This commit is contained in:
Bram Moolenaar
2019-01-06 13:11:05 +01:00
parent 4614f53e0f
commit f42b45d719
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/menu.c
View File

@@ -61,7 +61,6 @@ static char_u *menu_translate_tab_and_shift(char_u *arg_start);
static char *menu_mode_chars[] = {"n", "v", "s", "o", "i", "c", "tl", "t"};
static char_u e_notsubmenu[] = N_("E327: Part of menu-item path is not sub-menu");
static char_u e_othermode[] = N_("E328: Menu only exists in another mode");
static char_u e_nomenu[] = N_("E329: No menu \"%s\"");
#ifdef FEAT_TOOLBAR
@@ -956,7 +955,7 @@ remove_menu(
else if (*name != NUL)
{
if (!silent)
EMSG(_(e_othermode));
EMSG(_(e_menuothermode));
return FAIL;
}
@@ -1130,7 +1129,7 @@ show_menus(char_u *path_name, int modes)
}
else if ((menu->modes & modes) == 0x0)
{
EMSG(_(e_othermode));
EMSG(_(e_menuothermode));
vim_free(path_name);
return FAIL;
}