diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-13 16:39:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-13 16:39:56 +0200 |
| commit | d58b0f982ad758c59abe47627216a15497e9c3c1 (patch) | |
| tree | 009bae52a06848b67b3cea319d24d694b74cf068 /src | |
| parent | 4ae209597c486d630be929d2865ea112da8bc842 (diff) | |
| download | vim-git-d58b0f982ad758c59abe47627216a15497e9c3c1.tar.gz | |
patch 7.4.2207v7.4.2207
Problem: The +xpm feature is not sorted properly in :version output.
Solution: Move it up. (Tony Mechelynck)
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 28 |
1 files changed, 15 insertions, 13 deletions
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", @@ -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, |