Mercurial > vim

changeset 11770:0aa1910a3dfa v8.0.0767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0767: build failure with Athena and Motif commit https://github.com/vim/vim/commit/d60547bf80881f6c99bcbd7c8c4c6cfb7e405a90 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 24 20:15:30 2017 +0200 patch 8.0.0767: build failure with Athena and Motif Problem: Build failure with Athena and Motif. Solution: Move local variable delcarations. (Kazunobu Kuriyama)
author Christian Brabandt <cb@256bit.org>
date Mon, 24 Jul 2017 20:30:06 +0200
parents 970948345309
children d8b8e6237505
files src/gui_x11.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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));
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    767,
+/**/
     766,
 /**/
     765,