diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-16 12:49:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-16 12:49:27 +0200 |
| commit | 413756470917e76295643a32b0f6f21b35b2e9ae (patch) | |
| tree | ca49fc5eed58e969777b0a9112e3ad6c62b8b327 /src/menu.c | |
| parent | 2dfa4d7c13d32ccb6533f301249ebd0a5aab8979 (diff) | |
| download | vim-git-413756470917e76295643a32b0f6f21b35b2e9ae.tar.gz | |
Merge patch 7.2.434.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); } |