summaryrefslogtreecommitdiff
path: root/src/gui_w32.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-27 22:02:02 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-27 22:02:02 +0200
commitc9dcb427042eaecd95231682d559408bd5c7c46c (patch)
treec9515650e08867a9bdab0acec9dbf29ce6170d02 /src/gui_w32.c
parent9b846cb8ac0f1db4ffecdd2dabb0b99758228f74 (diff)
downloadvim-git-c9dcb427042eaecd95231682d559408bd5c7c46c.tar.gz
updated for version 7.3.1252v7.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)
Diffstat (limited to 'src/gui_w32.c')
-rw-r--r--src/gui_w32.c4
1 files changed, 3 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,