]> granicus.if.org Git - vim/commitdiff
patch 7.4.2207 v7.4.2207
authorBram Moolenaar <Bram@vim.org>
Sat, 13 Aug 2016 14:39:56 +0000 (16:39 +0200)
committerBram Moolenaar <Bram@vim.org>
Sat, 13 Aug 2016 14:39:56 +0000 (16:39 +0200)
Problem:    The +xpm feature is not sorted properly in :version output.
Solution:   Move it up. (Tony Mechelynck)

src/version.c

index bb6eaba247d78aad9cce95985f4b21fc95833907..6f571cfba4d8bc680ec95992191cbf87ba8091ee 100644 (file)
@@ -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,
 /**/