summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_w32.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 34d3dd4d9..a00e4efdf 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -4163,7 +4163,9 @@ get_toolbar_bitmap(vimmenu_T *menu)
* didn't exist or wasn't specified, try the menu name
*/
if (hbitmap == NULL
- && (gui_find_bitmap(menu->name, fname, "bmp") == OK))
+ && (gui_find_bitmap(menu->en_dname != NULL
+ ? menu->en_dname
+ : menu->dname, fname, "bmp") == OK))
hbitmap = LoadImage(
NULL,
fname,
diff --git a/src/version.c b/src/version.c
index a83e923b7..83487c7c6 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 */
/**/
+ 1252,
+/**/
1251,
/**/
1250,