Skip to content

Commit cabbc20

Browse files
committed
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)
1 parent 581b7aa commit cabbc20

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

src/eval.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12135,6 +12135,9 @@ f_has(argvars, rettv)
1213512135
#ifndef CASE_INSENSITIVE_FILENAME
1213612136
"fname_case",
1213712137
#endif
12138+
#ifdef HAVE_ACL
12139+
"acl",
12140+
#endif
1213812141
#ifdef FEAT_ARABIC
1213912142
"arabic",
1214012143
#endif
@@ -12538,7 +12541,12 @@ f_has(argvars, rettv)
1253812541
"xfontset",
1253912542
#endif
1254012543
#ifdef FEAT_XPM_W32
12541-
"xpm_w32",
12544+
"xpm",
12545+
"xpm_w32", /* for backward compatibility */
12546+
#else
12547+
# if defined(HAVE_XPM)
12548+
"xpm",
12549+
# endif
1254212550
#endif
1254312551
#ifdef USE_XSMP
1254412552
"xsmp",

src/version.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ static void version_msg __ARGS((char *s));
6060

6161
static char *(features[]) =
6262
{
63+
#ifdef HAVE_ACL
64+
"+acl",
65+
#else
66+
"-acl",
67+
#endif
6368
#ifdef AMIGA /* only for Amiga systems */
6469
# ifdef FEAT_ARP
6570
"+ARP",
@@ -721,12 +726,20 @@ static char *(features[]) =
721726
# else
722727
"-xpm_w32",
723728
# endif
729+
#else
730+
# ifdef HAVE_XPM
731+
"+xpm",
732+
# else
733+
"-xpm",
734+
# endif
724735
#endif
725736
NULL
726737
};
727738

728739
static int included_patches[] =
729740
{ /* Add new patch number below this line */
741+
/**/
742+
11,
730743
/**/
731744
10,
732745
/**/

0 commit comments

Comments
 (0)