projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| e7d66cb1 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.434 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.434 (after 7.2.432) | |
| 11 | Problem: Compilation fails without the multi-lang feature. | |
| 12 | Solution: Add #ifdefs. (Johm Marriott) | |
| 13 | Files: src/menu.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.433/src/menu.c 2010-05-14 22:24:31.000000000 +0200 | |
| 17 | --- src/menu.c 2010-05-16 12:28:21.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 1340,1346 **** | |
| 20 | --- 1340,1348 ---- | |
| 21 | if (idx == 0) /* first call: start at first item */ | |
| 22 | { | |
| 23 | menu = expand_menu; | |
| 24 | + #ifdef FEAT_MULTI_LANG | |
| 25 | should_advance = FALSE; | |
| 26 | + #endif | |
| 27 | } | |
| 28 | ||
| 29 | /* Skip PopUp[nvoci]. */ | |
| 30 | *************** | |
| 31 | *** 1401,1407 **** | |
| 32 | --- 1403,1411 ---- | |
| 33 | if (idx == 0) /* first call: start at first item */ | |
| 34 | { | |
| 35 | menu = expand_menu; | |
| 36 | + #ifdef FEAT_MULTI_LANG | |
| 37 | should_advance = FALSE; | |
| 38 | + #endif | |
| 39 | } | |
| 40 | ||
| 41 | /* Skip Browse-style entries, popup menus and separators. */ | |
| 42 | *************** | |
| 43 | *** 1506,1515 **** | |
| 44 | --- 1510,1521 ---- | |
| 45 | char_u *name; | |
| 46 | vimmenu_T *menu; | |
| 47 | { | |
| 48 | + #ifdef FEAT_MULTI_LANG | |
| 49 | if (menu->en_name != NULL | |
| 50 | && (menu_namecmp(name,menu->en_name) | |
| 51 | || menu_namecmp(name,menu->en_dname))) | |
| 52 | return TRUE; | |
| 53 | + #endif | |
| 54 | return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname); | |
| 55 | } | |
| 56 | ||
| 57 | *** ../vim-7.2.433/src/version.c 2010-05-14 23:14:37.000000000 +0200 | |
| 58 | --- src/version.c 2010-05-16 12:29:40.000000000 +0200 | |
| 59 | *************** | |
| 60 | *** 683,684 **** | |
| 61 | --- 683,686 ---- | |
| 62 | { /* Add new patch number below this line */ | |
| 63 | + /**/ | |
| 64 | + 434, | |
| 65 | /**/ | |
| 66 | ||
| 67 | -- | |
| 68 | hundred-and-one symptoms of being an internet addict: | |
| 69 | 43. You tell the kids they can't use the computer because "Daddy's got work to | |
| 70 | do" and you don't even have a job. | |
| 71 | ||
| 72 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 73 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 74 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 75 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |