From c9dcb427042eaecd95231682d559408bd5c7c46c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 27 Jun 2013 22:02:02 +0200 Subject: [PATCH] updated for version 7.3.1252 Problem: Gvim does not find the toolbar bitmap files in ~/vimfiles/bitmaps if the corresponding menu command contains additional characters like the shortcut marker '&' or if you use a non-english locale. Solution: Use menu->en_dname or menu->dname. (Martin Gieseking) --- src/gui_w32.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1252, /**/ 1251, /**/ -- 2.50.1