Mercurial > vim

changeset 5020:5eff37e92f03 v7.3.1254

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1254 Problem: Can't build without the multi-lang feature. (John Marriott) Solution: Add #ifdef.
author Bram Moolenaar <bram@vim.org>
date Thu, 27 Jun 2013 22:29:38 +0200
parents 3677dcf753e9
children e03423023b3b
files src/gui_w32.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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,