diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-09-20 19:57:15 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-09-20 19:57:15 +0200 |
commit | 7795bfea6d30c85f2c05d986a0cfe4019df4d74d (patch) | |
tree | 15fe1863e42510fcec713d327fd304030a7400f3 /src | |
parent | 1d59aa1fdfb191d9872ff87eb94652acd374b293 (diff) |
patch 8.2.1713: Motif GUI: crash when setting menu colorsv8.2.1713
Problem: Motif GUI: crash when setting menu colors. (Andrzej Bylicki)
Solution: Add {} to make "n" incremented correctly. (closes #6989,
closes #5948)
Diffstat (limited to 'src')
-rw-r--r-- | src/gui_motif.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c index 9d13b57b4e..57d50b0eed 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -916,9 +916,13 @@ gui_mch_add_menu(vimmenu_T *menu, int idx) # 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 index 615abc74e2..a7def1b6cf 100644 --- 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, |