diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-07-21 21:11:17 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-07-21 21:11:17 +0000 |
| commit | 342337a1a0faf3deab4e702dfa445d18da6c4a32 (patch) | |
| tree | 4ab66e5cdcc60b0dbbd19a178763efb06e2db24b /src/menu.c | |
| parent | 4536002e3046631e1dc73cdaeb59d97f3ad25223 (diff) | |
| download | vim-git-342337a1a0faf3deab4e702dfa445d18da6c4a32.tar.gz | |
updated for version 7.0112v7.0112
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/menu.c b/src/menu.c index 678705694..c92a812ca 100644 --- a/src/menu.c +++ b/src/menu.c @@ -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; |