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)

diff --git a/src/eval.c b/src/eval.c
index 73844800c4773262cc9545319f74a9499b68b3c1..807efe25f3b7666aa5fec8aafe146f1844d31086 100644 (file)
--- 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 61694a4672d2e7c3e27fc8eae17c8134c8802011..3e530040d9181a546d21086159f9a3268bf0a3c5 100644 (file)
--- 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,12 +726,20 @@ static char *(features[]) =
 # 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 */
+/**/
+    11,
 /**/
     10,
 /**/