From: Bram Moolenaar Date: Mon, 24 Jul 2017 18:15:30 +0000 (+0200) Subject: patch 8.0.0767: build failure with Athena and Motif X-Git-Tag: v8.0.0767 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d60547bf80881f6c99bcbd7c8c4c6cfb7e405a90;p=vim patch 8.0.0767: build failure with Athena and Motif Problem: Build failure with Athena and Motif. Solution: Move local variable delcarations. (Kazunobu Kuriyama) --- diff --git a/src/gui_x11.c b/src/gui_x11.c index e0b91e65c..855f4be0e 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -2270,8 +2270,6 @@ fontset_ascent(XFontSet fs) gui_mch_get_color(char_u *name) { guicolor_T requested; - XColor available; - Colormap colormap; /* can't do this when GUI not running */ if (!gui.in_use || name == NULL || *name == NUL) @@ -2295,6 +2293,8 @@ gui_mch_get_color(char_u *name) gui_mch_get_rgb_color(int r, int g, int b) { char spec[8]; /* space enough to hold "#RRGGBB" */ + XColor available; + Colormap colormap; vim_snprintf(spec, sizeof(spec), "#%.2x%.2x%.2x", r, g, b); colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy)); diff --git a/src/version.c b/src/version.c index 8d698c7aa..d629eac52 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 767, /**/ 766, /**/