0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2013-08-30 16:35:44 +02:00
parent 195ef0ccb2
commit b5ef5e1c21
2 changed files with 22 additions and 1 deletions

View File

@@ -12135,6 +12135,9 @@ f_has(argvars, rettv)
#ifndef CASE_INSENSITIVE_FILENAME #ifndef CASE_INSENSITIVE_FILENAME
"fname_case", "fname_case",
#endif #endif
#ifdef HAVE_ACL
"acl",
#endif
#ifdef FEAT_ARABIC #ifdef FEAT_ARABIC
"arabic", "arabic",
#endif #endif
@@ -12538,7 +12541,12 @@ f_has(argvars, rettv)
"xfontset", "xfontset",
#endif #endif
#ifdef FEAT_XPM_W32 #ifdef FEAT_XPM_W32
"xpm_w32", "xpm",
"xpm_w32", /* for backward compatibility */
#else
# if defined(HAVE_XPM)
"xpm",
# endif
#endif #endif
#ifdef USE_XSMP #ifdef USE_XSMP
"xsmp", "xsmp",

View File

@@ -60,6 +60,11 @@ static void version_msg __ARGS((char *s));
static char *(features[]) = static char *(features[]) =
{ {
#ifdef HAVE_ACL
"+acl",
#else
"-acl",
#endif
#ifdef AMIGA /* only for Amiga systems */ #ifdef AMIGA /* only for Amiga systems */
# ifdef FEAT_ARP # ifdef FEAT_ARP
"+ARP", "+ARP",
@@ -721,12 +726,20 @@ static char *(features[]) =
# else # else
"-xpm_w32", "-xpm_w32",
# endif # endif
#else
# ifdef HAVE_XPM
"+xpm",
# else
"-xpm",
# endif
#endif #endif
NULL NULL
}; };
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
11,
/**/ /**/
10, 10,
/**/ /**/