Mercurial > vim

comparison src/menu.c @ 2166:04c39cb3a10f vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge patch 7.2.434.
author Bram Moolenaar <bram@vim.org>
date Sun, 16 May 2010 12:49:27 +0200
parents 4269a0673478
children 120502692d82
comparison
equal deleted inserted replaced
2164:9503b042229b 2166:04c39cb3a10f
1338 #endif 1338 #endif
1339 1339
1340 if (idx == 0) /* first call: start at first item */ 1340 if (idx == 0) /* first call: start at first item */
1341 { 1341 {
1342 menu = expand_menu; 1342 menu = expand_menu;
1343 #ifdef FEAT_MULTI_LANG
1343 should_advance = FALSE; 1344 should_advance = FALSE;
1345 #endif
1344 } 1346 }
1345 1347
1346 /* Skip PopUp[nvoci]. */ 1348 /* Skip PopUp[nvoci]. */
1347 while (menu != NULL && (menu_is_hidden(menu->dname) 1349 while (menu != NULL && (menu_is_hidden(menu->dname)
1348 || menu_is_separator(menu->dname) 1350 || menu_is_separator(menu->dname)
1399 #endif 1401 #endif
1400 1402
1401 if (idx == 0) /* first call: start at first item */ 1403 if (idx == 0) /* first call: start at first item */
1402 { 1404 {
1403 menu = expand_menu; 1405 menu = expand_menu;
1406 #ifdef FEAT_MULTI_LANG
1404 should_advance = FALSE; 1407 should_advance = FALSE;
1408 #endif
1405 } 1409 }
1406 1410
1407 /* Skip Browse-style entries, popup menus and separators. */ 1411 /* Skip Browse-style entries, popup menus and separators. */
1408 while (menu != NULL 1412 while (menu != NULL
1409 && ( menu_is_hidden(menu->dname) 1413 && ( menu_is_hidden(menu->dname)
1504 static int 1508 static int
1505 menu_name_equal(name, menu) 1509 menu_name_equal(name, menu)
1506 char_u *name; 1510 char_u *name;
1507 vimmenu_T *menu; 1511 vimmenu_T *menu;
1508 { 1512 {
1513 #ifdef FEAT_MULTI_LANG
1509 if (menu->en_name != NULL 1514 if (menu->en_name != NULL
1510 && (menu_namecmp(name,menu->en_name) 1515 && (menu_namecmp(name,menu->en_name)
1511 || menu_namecmp(name,menu->en_dname))) 1516 || menu_namecmp(name,menu->en_dname)))
1512 return TRUE; 1517 return TRUE;
1518 #endif
1513 return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname); 1519 return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
1514 } 1520 }
1515 1521
1516 static int 1522 static int
1517 menu_namecmp(name, mname) 1523 menu_namecmp(name, mname)