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

brammool · brammool · commit 26cd3063b2e2 · 2020-09-20T21:13:27.000+02:00
Problem:    Motif GUI: commented out code missed {}.
Solution:   Add {} and reenable the code. (similar to #6989)
diff --git 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
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1715,
 /**/
     1714,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -1242,11 +1242,11 @@ add_pixmap_args(vimmenu_T menu, Arg args, int n)`
`1242`	`1242`	`}`
`1243`	`1243`	`else`
`1244`	`1244`	`{`
`1245`		`-# if 0 // DISABLED - this causes a crash when running "make test_gui" in`
`1246`	`1245`	`// Test_colorscheme()`
`1247`	`1246`	`if (menu->xpm_fname != NULL)`
	`1247`	`+ {`
`1248`	`1248`	`XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++;`
`1249`		`-# endif`
	`1249`	`+ }`
`1250`	`1250`	`XtSetArg(args[n], XmNpixmapData, menu->xpm); n++;`
`1251`	`1251`	`XtSetArg(args[n], XmNlabelLocation, XmBOTTOM); n++;`
`1252`	`1252`	`}`