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