aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1715: Motif GUI: commented out code missed {}

Browse Source 
Problem:    Motif GUI: commented out code missed {}.
Solution:   Add {} and reenable the code. (similar to #6989)
This commit is contained in:
Bram Moolenaar 2020-09-20 21:13:27 +02:00
parent 8902b31f1b
commit 26cd3063b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_motif.c
View File

@ -1242,11 +1242,11 @@ add_pixmap_args(vimmenu_T *menu, Arg *args, int n)
} }
else else
{ {
# if 0 // DISABLED - this causes a crash when running "make test_gui" in
// Test_colorscheme() // Test_colorscheme()
if (menu->xpm_fname != NULL) if (menu->xpm_fname != NULL)
{
XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++; XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++;
# endif }
XtSetArg(args[n], XmNpixmapData, menu->xpm); n++; XtSetArg(args[n], XmNpixmapData, menu->xpm); n++;
XtSetArg(args[n], XmNlabelLocation, XmBOTTOM); n++; XtSetArg(args[n], XmNlabelLocation, XmBOTTOM); n++;
} }

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1715,
/**/ /**/
1714, 1714,
/**/ /**/