diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-20 21:13:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-20 21:13:27 +0200 |
| commit | 26cd3063b2e2084cfd17989e7584c64f278aaaef (patch) | |
| tree | 445be672f83bdd70146d1632e785ff6b2f27c3b6 | |
| parent | 8902b31f1b31c117915defc23ac45cdc1f5c671b (diff) | |
| download | vim-git-8.2.1715.tar.gz | |
patch 8.2.1715: Motif GUI: commented out code missed {}v8.2.1715
Problem: Motif GUI: commented out code missed {}.
Solution: Add {} and reenable the code. (similar to #6989)
| -rw-r--r-- | src/gui_motif.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c index 57d50b0ee..543304fe4 100644 --- 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 7031d7a56..891cdac07 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 */ /**/ + 1715, +/**/ 1714, /**/ 1713, |