+/-xpm or +/-xpm_w32 out of sequence in :version (with patch)

[Tony Mechelynck]

Problem: +xpm (or -xpm or +/-xpm_w32) is out of sequence in the output
of :version
Solution: reorder the set of features in src/version.c

Note: The attached patch ("git-style" IIUC, but made from my clone of
the Mercurial mirror) has been written with "only" 6 lines of unified
context, the maximum compatible with _not_ barging into the number of
the latest patch number before it (this is version.c) (the patches I
usually write, when I do, have 8 lines of context, the "Mozilla
standard" setting). The patchnumber of this patch will have to be
concatenated as a different hulk, but with only 2 lines of context,
for the same source file, when this patch is made ready for inclusion
into the official Vim source.

Best regards,
Tony.

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

# HG changeset patch
# User Tony Mechelynck <antoine.mechely...@gmail.com>
# Parent  dc8ef890d0f01c5cca0a6564f9a4ea61a8035210
move +xpm into sequence in output of :version

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -719,16 +719,29 @@ static char *(features[]) =
 #else
        "-xfontset",
 #endif
 #ifdef FEAT_XIM
        "+xim",
 #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",
 # else
 #  ifdef USE_XSMP
        "+xsmp",
 #  else
        "-xsmp",
@@ -740,29 +753,16 @@ static char *(features[]) =
        "-xterm_clipboard",
 # endif
 #endif
 #ifdef FEAT_XTERM_SAVE
        "+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 */
 /**/
     2203,
 /**/