# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1600629305 -7200
# Node ID 2ccc3e68b617d1166982353b531d945d8a3d4829
# Parent  339f74bfd2bda82f3b3ae9bf7ce97d94af3d8149
patch 8.2.1715: Motif GUI: commented out code missed {}

Commit: https://github.com/vim/vim/commit/26cd3063b2e2084cfd17989e7584c64f278aaaef
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Sep 20 21:13:27 2020 +0200

    patch 8.2.1715: Motif GUI: commented out code missed {}

    Problem:    Motif GUI: commented out code missed {}.
    Solution:   Add {} and reenable the code. (similar to https://github.com/vim/vim/issues/6989)

diff --git a/src/gui_motif.c b/src/gui_motif.c
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1242,11 +1242,11 @@ add_pixmap_args(vimmenu_T *menu, Arg *ar
     }
     else
     {
-# if 0  // DISABLED - this causes a crash when running "make test_gui" in
 	// Test_colorscheme()
 	if (menu->xpm_fname != NULL)
+	{
 	    XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++;
-# endif
+	}
 	XtSetArg(args[n], XmNpixmapData, menu->xpm); n++;
 	XtSetArg(args[n], XmNlabelLocation, XmBOTTOM); n++;
     }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1715,
+/**/
     1714,
 /**/
     1713,