1fa1ff
To: vim_dev@googlegroups.com
1fa1ff
Subject: Patch 7.4.011
1fa1ff
Fcc: outbox
1fa1ff
From: Bram Moolenaar <Bram@moolenaar.net>
1fa1ff
Mime-Version: 1.0
1fa1ff
Content-Type: text/plain; charset=UTF-8
1fa1ff
Content-Transfer-Encoding: 8bit
1fa1ff
------------
1fa1ff
1fa1ff
Patch 7.4.011
1fa1ff
Problem:    Cannot find out if "acl" and "xpm" features are supported.
1fa1ff
Solution:   Add "acl" and "xpm" to the list of features. (Ken Takata)
1fa1ff
Files:	    src/eval.c, src/version.c
1fa1ff
1fa1ff
1fa1ff
*** ../vim-7.4.010/src/eval.c	2013-08-30 16:00:04.000000000 +0200
1fa1ff
--- src/eval.c	2013-08-30 16:34:12.000000000 +0200
1fa1ff
***************
1fa1ff
*** 12135,12140 ****
1fa1ff
--- 12135,12143 ----
1fa1ff
  #ifndef CASE_INSENSITIVE_FILENAME
1fa1ff
  	"fname_case",
1fa1ff
  #endif
1fa1ff
+ #ifdef HAVE_ACL
1fa1ff
+ 	"acl",
1fa1ff
+ #endif
1fa1ff
  #ifdef FEAT_ARABIC
1fa1ff
  	"arabic",
1fa1ff
  #endif
1fa1ff
***************
1fa1ff
*** 12538,12544 ****
1fa1ff
  	"xfontset",
1fa1ff
  #endif
1fa1ff
  #ifdef FEAT_XPM_W32
1fa1ff
! 	"xpm_w32",
1fa1ff
  #endif
1fa1ff
  #ifdef USE_XSMP
1fa1ff
  	"xsmp",
1fa1ff
--- 12541,12552 ----
1fa1ff
  	"xfontset",
1fa1ff
  #endif
1fa1ff
  #ifdef FEAT_XPM_W32
1fa1ff
! 	"xpm",
1fa1ff
! 	"xpm_w32",	/* for backward compatibility */
1fa1ff
! #else
1fa1ff
! # if defined(HAVE_XPM)
1fa1ff
! 	"xpm",
1fa1ff
! # endif
1fa1ff
  #endif
1fa1ff
  #ifdef USE_XSMP
1fa1ff
  	"xsmp",
1fa1ff
*** ../vim-7.4.010/src/version.c	2013-08-30 16:00:04.000000000 +0200
1fa1ff
--- src/version.c	2013-08-30 16:34:37.000000000 +0200
1fa1ff
***************
1fa1ff
*** 60,65 ****
1fa1ff
--- 60,70 ----
1fa1ff
  
1fa1ff
  static char *(features[]) =
1fa1ff
  {
1fa1ff
+ #ifdef HAVE_ACL
1fa1ff
+ 	"+acl",
1fa1ff
+ #else
1fa1ff
+ 	"-acl",
1fa1ff
+ #endif
1fa1ff
  #ifdef AMIGA		/* only for Amiga systems */
1fa1ff
  # ifdef FEAT_ARP
1fa1ff
  	"+ARP",
1fa1ff
***************
1fa1ff
*** 721,726 ****
1fa1ff
--- 726,737 ----
1fa1ff
  # else
1fa1ff
  	"-xpm_w32",
1fa1ff
  # endif
1fa1ff
+ #else
1fa1ff
+ # ifdef HAVE_XPM
1fa1ff
+ 	"+xpm",
1fa1ff
+ # else
1fa1ff
+ 	"-xpm",
1fa1ff
+ # endif
1fa1ff
  #endif
1fa1ff
  	NULL
1fa1ff
  };
1fa1ff
*** ../vim-7.4.010/src/version.c	2013-08-30 16:00:04.000000000 +0200
1fa1ff
--- src/version.c	2013-08-30 16:34:37.000000000 +0200
1fa1ff
***************
1fa1ff
*** 729,730 ****
1fa1ff
--- 740,743 ----
1fa1ff
  {   /* Add new patch number below this line */
1fa1ff
+ /**/
1fa1ff
+     11,
1fa1ff
  /**/
1fa1ff
1fa1ff
-- 
1fa1ff
hundred-and-one symptoms of being an internet addict:
1fa1ff
141. You'd rather go to http://www.weather.com/ than look out your window.
1fa1ff
1fa1ff
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
1fa1ff
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
1fa1ff
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
1fa1ff
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///