From 26cd3063b2e2084cfd17989e7584c64f278aaaef Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 20 Sep 2020 21:13:27 +0200
Subject: 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 #6989)
---
 src/gui_motif.c | 4 ++--
 src/version.c   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui_motif.c b/src/gui_motif.c
index 57d50b0ee..543304fe4 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1242,11 +1242,11 @@ add_pixmap_args(vimmenu_T *menu, Arg *args, int n)
     }
     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
index 7031d7a56..891cdac07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1715,
 /**/
     1714,
 /**/
-- 
cgit v1.2.1