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

updated for version 7.0112

Browse Source
This commit is contained in:
Bram Moolenaar
2005-07-21 21:11:17 +00:00
parent 4536002e30
commit 342337a1a0
5 changed files with 112 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/menu.c
View File

@@ -63,7 +63,7 @@ static char_u menu_mode_chars[] = {'n', 'v', 'o', 'i', 'c', '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 of that name");
static char_u e_nomenu[] = N_("E329: No menu \"%s\"");
#ifdef FEAT_TOOLBAR
static const char *toolbar_names[] =
@@ -841,7 +841,7 @@ menu_nable_recurse(menu, name, modes, enable)
}
if (*name != NUL && *name != '*' && menu == NULL)
{
EMSG(_(e_nomenu));
EMSG2(_(e_nomenu), name);
return FAIL;
}
@@ -934,7 +934,7 @@ remove_menu(menup, name, modes, silent)
if (menu == NULL)
{
if (!silent)
EMSG(_(e_nomenu));
EMSG2(_(e_nomenu), name);
return FAIL;
}
@@ -1079,7 +1079,7 @@ show_menus(path_name, modes)
}
if (menu == NULL)
{
EMSG(_(e_nomenu));
EMSG2(_(e_nomenu), name);
vim_free(path_name);
return FAIL;
}
@@ -1396,6 +1396,7 @@ get_menu_names(xp, idx)
/*
* Skip over this element of the menu path and return the start of the next
* element. Any \ and ^Vs are removed from the current element.
* "name" may be modified.
*/
char_u *
menu_name_skip(name)
@@ -1872,6 +1873,16 @@ gui_show_popupmenu()
return;
mode = menu_mode_chars[mode];
#ifdef FEAT_AUTOCMD
{
char_u ename[2];
ename[0] = mode;
ename[1] = NUL;
apply_autocmds(EVENT_MENUPOPUP, ename, NULL, FALSE, curbuf);
}
#endif
for (menu = root_menu; menu != NULL; menu = menu->next)
if (STRNCMP("PopUp", menu->name, 5) == 0 && menu->name[5] == mode)
break;