Mercurial > vim

changeset 9865:649a6a3fa714 v7.4.2207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/d58b0f982ad758c59abe47627216a15497e9c3c1 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 13 16:39:56 2016 +0200 patch 7.4.2207 Problem: The +xpm feature is not sorted properly in :version output. Solution: Move it up. (Tony Mechelynck)
author Christian Brabandt <cb@256bit.org>
date Sat, 13 Aug 2016 16:45:05 +0200
parents 3b602e8d0cea
children a6874bce6264
files src/version.c
diffstat 1 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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",
@@ -745,25 +758,14 @@ static char *(features[]) =
 #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,
 /**/
     2205,