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 e0b91e65cdc14e9cef6abb859971a89de8a985da..855f4be0e9183f3a448f72e12f9b8d1e8b239eba 100644 (file)
--- 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 8d698c7aa5775466c3b69310f8c1fc4b7baef65a..d629eac520dbc41cd91fc378a01e759ea5c5b201 100644 (file)
--- 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,
 /**/