diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-08-30 16:35:44 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-08-30 16:35:44 +0200 |
commit | b5ef5e1c217931023e46ce4a6563d80d259c8fc8 (patch) | |
tree | 3e439681037dbac1a2891a9425be4f8567247372 /src | |
parent | 195ef0ccb26b3edfd0f31b30d80108290b2e9b1d (diff) | |
download | vim-git-b5ef5e1c217931023e46ce4a6563d80d259c8fc8.tar.gz |
updated for version 7.4.011v7.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)
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 10 | ||||
-rw-r--r-- | src/version.c | 13 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 73844800c..807efe25f 100644 --- 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", diff --git a/src/version.c b/src/version.c index 61694a467..3e530040d 100644 --- 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, |