From 413756470917e76295643a32b0f6f21b35b2e9ae Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 May 2010 12:49:27 +0200 Subject: [PATCH] Merge patch 7.2.434. --- src/menu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/menu.c b/src/menu.c index 1f0378481..0fb286ca6 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1340,7 +1340,9 @@ get_menu_name(xp, idx) 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 @@ get_menu_names(xp, idx) 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 @@ menu_name_equal(name, menu) 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); } -- 2.50.1