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 a00e4efdf36de3bf123de3a7ebccaf7dc578b3b4..4443d35c0aad2b3cb9f8a3116326a60e8357ccea 100644 (file)
--- 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 dbd9542572683532528045df4eeb6335390e374e..6f0225325dcfb822939f29c170b7dbc14202f1c7 100644 (file)
--- 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,
 /**/