Mercurial > vim

changeset 5016:875a0aeb301c v7.3.1252

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 27 Jun 2013 22:02:02 +0200
parents f0a1b93305a6
children 13ae542e58ba
files src/gui_w32.c src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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,