summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_w32.c8
-rw-r--r--src/version.c2
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,