diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-05-16 12:32:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-05-16 12:32:51 +0200 |
| commit | f005ca35ec7c68dc4e30871d13a6ac4dbff4d228 (patch) | |
| tree | 193b7a94b98d86b8cc63a12cd4df610e9c8c57be | |
| parent | 02bb8a03679b975d1625b3dfa173eeb134b12abb (diff) | |
| download | vim-f005ca35ec7c68dc4e30871d13a6ac4dbff4d228.tar.gz | |
Problem: Compilation fails without the multi-lang feature.
Solution: Add #ifdefs. (Johm Marriott)
| -rw-r--r-- | src/menu.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -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 fc635024..f0cf4e44 100644 --- 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, |