diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-27 22:29:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-27 22:29:38 +0200 |
| commit | a5f5c8be8f0f5f9e6cbe7b9f3fed234f32cf3467 (patch) | |
| tree | f1942a9bb9c929afba3e609a59fb75e2cd28b2fe | |
| parent | 5737ca2350ffcc2afc1495f27ed746f6163bab47 (diff) | |
| download | vim-git-a5f5c8be8f0f5f9e6cbe7b9f3fed234f32cf3467.tar.gz | |
updated for version 7.3.1254v7.3.1254
Problem: Can't build without the multi-lang feature. (John Marriott)
Solution: Add #ifdef.
| -rw-r--r-- | src/gui_w32.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index a00e4efdf..4443d35c0 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -4163,9 +4163,11 @@ get_toolbar_bitmap(vimmenu_T *menu) * didn't exist or wasn't specified, try the menu name */ if (hbitmap == NULL - && (gui_find_bitmap(menu->en_dname != NULL - ? menu->en_dname - : menu->dname, fname, "bmp") == OK)) + && (gui_find_bitmap( +#ifdef FEAT_MULTI_LANG + menu->en_dname != NULL ? menu->en_dname : +#endif + menu->dname, fname, "bmp") == OK)) hbitmap = LoadImage( NULL, fname, diff --git a/src/version.c b/src/version.c index dbd954257..6f0225325 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1254, +/**/ 1253, /**/ 1252, |