Merge patch 7.2.434.
diff --git a/src/menu.c b/src/menu.c
index 1f03784..0fb286c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1340,7 +1340,9 @@
if (idx == 0) /* first call: start at first item */
{
menu = expand_menu;
+#ifdef FEAT_MULTI_LANG
should_advance = FALSE;
+#endif
}
/* Skip PopUp[nvoci]. */
@@ -1401,7 +1403,9 @@
if (idx == 0) /* first call: start at first item */
{
menu = expand_menu;
+#ifdef FEAT_MULTI_LANG
should_advance = FALSE;
+#endif
}
/* Skip Browse-style entries, popup menus and separators. */
@@ -1506,10 +1510,12 @@
char_u *name;
vimmenu_T *menu;
{
+#ifdef FEAT_MULTI_LANG
if (menu->en_name != NULL
&& (menu_namecmp(name,menu->en_name)
|| menu_namecmp(name,menu->en_dname)))
return TRUE;
+#endif
return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
}