Mercurial > vim
changeset 5316:54e66395831c v7.4.011
updated for version 7.4.011
Problem: Cannot find out if "acl" and "xpm" features are supported.
Solution: Add "acl" and "xpm" to the list of features. (Ken Takata)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 30 Aug 2013 16:35:44 +0200 |
| parents | fe180a01a2c2 |
| children | 076f115ed30d |
| files | src/eval.c src/version.c |
| diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -12135,6 +12135,9 @@ f_has(argvars, rettv) #ifndef CASE_INSENSITIVE_FILENAME "fname_case", #endif +#ifdef HAVE_ACL + "acl", +#endif #ifdef FEAT_ARABIC "arabic", #endif @@ -12538,7 +12541,12 @@ f_has(argvars, rettv) "xfontset", #endif #ifdef FEAT_XPM_W32 - "xpm_w32", + "xpm", + "xpm_w32", /* for backward compatibility */ +#else +# if defined(HAVE_XPM) + "xpm", +# endif #endif #ifdef USE_XSMP "xsmp",
--- a/src/version.c +++ b/src/version.c @@ -60,6 +60,11 @@ static void version_msg __ARGS((char *s) static char *(features[]) = { +#ifdef HAVE_ACL + "+acl", +#else + "-acl", +#endif #ifdef AMIGA /* only for Amiga systems */ # ifdef FEAT_ARP "+ARP", @@ -721,6 +726,12 @@ static char *(features[]) = # else "-xpm_w32", # endif +#else +# ifdef HAVE_XPM + "+xpm", +# else + "-xpm", +# endif #endif NULL }; @@ -728,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 11, +/**/ 10, /**/ 9,