# HG changeset patch # User Bram Moolenaar # Date 1274005971 -7200 # Node ID 7b875bfb39b871d5d40525d579e30358bab6be1a # Parent 733f0dc510c311493057f181affaa3643f4f5fd9 updated for version 7.2.434 Problem: Compilation fails without the multi-lang feature. Solution: Add #ifdefs. (Johm Marriott) diff --git a/src/menu.c b/src/menu.c --- 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 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 434, +/**/ 433, /**/ 432,