# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1600624865 -7200
# Node ID 858d7ceb1135eee152c3bf071aabababdb8af28c
# Parent  75ff30a7818963b44ea95e7849f0790ad415f4d2
patch 8.2.1713: Motif GUI: crash when setting menu colors

Commit: https://github.com/vim/vim/commit/7795bfea6d30c85f2c05d986a0cfe4019df4d74d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Sep 20 19:57:15 2020 +0200

    patch 8.2.1713: Motif GUI: crash when setting menu colors

    Problem:    Motif GUI: crash when setting menu colors. (Andrzej Bylicki)
    Solution:   Add {} to make "n" incremented correctly. (closes https://github.com/vim/vim/issues/6989,
                closes #5948)

diff --git a/src/gui_motif.c b/src/gui_motif.c
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -916,9 +916,13 @@ gui_mch_add_menu(vimmenu_T *menu, int id
 # endif
 	{
 	    if (gui.menu_bg_pixel != INVALCOLOR)
+	    {
 		XtSetArg(arg[0], XmNbackground, gui.menu_bg_pixel); n++;
+	    }
 	    if (gui.menu_fg_pixel != INVALCOLOR)
+	    {
 		XtSetArg(arg[1], XmNforeground, gui.menu_fg_pixel); n++;
+	    }
 	    menu->submenu_id = XmCreatePopupMenu(textArea, "contextMenu",
 								      arg, n);
 	    menu->id = (Widget)0;
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 */
 /**/
+    1713,
+/**/
     1712,
 /**/
     1711,