changeset 2166:04c39cb3a10f vim73

Merge patch 7.2.434.
author Bram Moolenaar <bram@vim.org>
date Sun, 16 May 2010 12:49:27 +0200
parents 9503b042229b
children 99b00399c7b4
files src/menu.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }