changeset 22333:2ccc3e68b617 v8.2.1715

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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 20 Sep 2020 21:15:05 +0200
parents 339f74bfd2bd
children 83341966da76
files src/gui_motif.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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++;
     }
--- 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,