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

Merge patch 7.2.434.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-05-16 12:49:27 +02:00
parent 2dfa4d7c13
commit 4137564709
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/menu.c
View File

@@ -1340,7 +1340,9 @@ get_menu_name(xp, idx)
if (idx == 0) /* first call: start at first item */ if (idx == 0) /* first call: start at first item */
{ {
menu = expand_menu; menu = expand_menu;
#ifdef FEAT_MULTI_LANG
should_advance = FALSE; should_advance = FALSE;
#endif
} }
/* Skip PopUp[nvoci]. */ /* Skip PopUp[nvoci]. */
@@ -1401,7 +1403,9 @@ get_menu_names(xp, idx)
if (idx == 0) /* first call: start at first item */ if (idx == 0) /* first call: start at first item */
{ {
menu = expand_menu; menu = expand_menu;
#ifdef FEAT_MULTI_LANG
should_advance = FALSE; should_advance = FALSE;
#endif
} }
/* Skip Browse-style entries, popup menus and separators. */ /* Skip Browse-style entries, popup menus and separators. */
@@ -1506,10 +1510,12 @@ menu_name_equal(name, menu)
char_u *name; char_u *name;
vimmenu_T *menu; vimmenu_T *menu;
{ {
#ifdef FEAT_MULTI_LANG
if (menu->en_name != NULL if (menu->en_name != NULL
&& (menu_namecmp(name,menu->en_name) && (menu_namecmp(name,menu->en_name)
|| menu_namecmp(name,menu->en_dname))) || menu_namecmp(name,menu->en_dname)))
return TRUE; return TRUE;
#endif
return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname); return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
} }