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)

diff --git a/src/gui_motif.c b/src/gui_motif.c
index 57d50b0eed5a6e653ddd58222b38fea2bb56eb1a..543304fe43403a953eb5d102b4bdc8c5ae13ab3a 100644 (file)
--- 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 7031d7a566523cc42423b7b8670db4796da55ab3..891cdac07ce00befe9e797a2dae8b240fa6e772b 100644 (file)
--- 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,
 /**/