From 546b35e190b790508f0c9b52ed3ceebf186e4217 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 May 2010 12:32:51 +0200 Subject: [PATCH] updated for version 7.2.434 Problem: Compilation fails without the multi-lang feature. Solution: Add #ifdefs. (Johm Marriott) --- src/menu.c | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 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); } diff --git a/src/version.c b/src/version.c index fc6350249..f0cf4e448 100644 --- a/src/version.c +++ b/src/version.c @@ -681,6 +681,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 434, /**/ 433, /**/ -- 2.50.1