Blame SOURCES/7.4.011

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