From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 27 Jun 2013 20:29:38 +0000 (+0200)
Subject: updated for version 7.3.1254
X-Git-Tag: v7.3.1254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f5c8be8f0f5f9e6cbe7b9f3fed234f32cf3467;p=vim

updated for version 7.3.1254
Problem:    Can't build without the multi-lang feature. (John Marriott)
Solution:   Add #ifdef.
---

diff --git a/src/gui_w32.c b/src/gui_w32.c
index a00e4efdf..4443d35c0 100644
--- 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,
diff --git a/src/version.c b/src/version.c
index dbd954257..6f0225325 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 */
+/**/
+    1254,
 /**/
     1253,
 /**/