From: Bram Moolenaar Date: Sat, 13 Aug 2016 14:39:56 +0000 (+0200) Subject: patch 7.4.2207 X-Git-Tag: v7.4.2207 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d58b0f982ad758c59abe47627216a15497e9c3c1;p=vim patch 7.4.2207 Problem: The +xpm feature is not sorted properly in :version output. Solution: Move it up. (Tony Mechelynck) --- diff --git a/src/version.c b/src/version.c index bb6eaba24..6f571cfba 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,19 @@ static char *(features[]) = #else "-xim", #endif +#ifdef WIN3264 +# ifdef FEAT_XPM_W32 + "+xpm_w32", +# else + "-xpm_w32", +# endif +#else +# ifdef HAVE_XPM + "+xpm", +# else + "-xpm", +# endif +#endif #if defined(UNIX) || defined(VMS) # ifdef USE_XSMP_INTERACT "+xsmp_interact", @@ -744,25 +757,14 @@ static char *(features[]) = "+xterm_save", #else "-xterm_save", -#endif -#ifdef WIN3264 -# ifdef FEAT_XPM_W32 - "+xpm_w32", -# else - "-xpm_w32", -# endif -#else -# ifdef HAVE_XPM - "+xpm", -# else - "-xpm", -# endif #endif NULL }; static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2207, /**/ 2206, /**/