|
 |
aa876b6 |
To: vim_dev@googlegroups.com
|
|
|
aa876b6 |
Subject: Patch 7.4.255
|
|
|
aa876b6 |
Fcc: outbox
|
|
|
aa876b6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
aa876b6 |
Mime-Version: 1.0
|
|
|
aa876b6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
aa876b6 |
Content-Transfer-Encoding: 8bit
|
|
|
aa876b6 |
------------
|
|
|
aa876b6 |
|
|
|
aa876b6 |
Patch 7.4.255
|
|
|
aa876b6 |
Problem: Configure check for smack doesn't work with all shells. (David
|
|
|
aa876b6 |
Larson)
|
|
|
aa876b6 |
Solution: Remove spaces in set command.
|
|
|
aa876b6 |
Files: src/configure.in, src/auto/configure
|
|
|
aa876b6 |
|
|
|
aa876b6 |
|
|
|
aa876b6 |
*** ../vim-7.4.254/src/configure.in 2014-04-10 11:09:11.676036810 +0200
|
|
|
aa876b6 |
--- src/configure.in 2014-04-10 19:53:38.884105545 +0200
|
|
|
aa876b6 |
***************
|
|
|
aa876b6 |
*** 405,411 ****
|
|
|
aa876b6 |
AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
|
|
|
aa876b6 |
AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
|
|
|
aa876b6 |
AC_MSG_RESULT(yes),
|
|
|
aa876b6 |
! AC_MSG_RESULT(no); enable_smack = "no")
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
if test "$enable_smack" = "yes"; then
|
|
|
aa876b6 |
AC_CHECK_LIB(attr, setxattr,
|
|
|
aa876b6 |
--- 405,411 ----
|
|
|
aa876b6 |
AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
|
|
|
aa876b6 |
AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
|
|
|
aa876b6 |
AC_MSG_RESULT(yes),
|
|
|
aa876b6 |
! AC_MSG_RESULT(no); enable_smack="no")
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
if test "$enable_smack" = "yes"; then
|
|
|
aa876b6 |
AC_CHECK_LIB(attr, setxattr,
|
|
|
aa876b6 |
***************
|
|
|
aa876b6 |
*** 2643,2649 ****
|
|
|
aa876b6 |
AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
|
|
|
aa876b6 |
AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
|
|
|
aa876b6 |
AC_MSG_RESULT(yes),
|
|
|
aa876b6 |
! AC_MSG_RESULT(no; xim has been disabled); enable_xim = "no")
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
CPPFLAGS=$cppflags_save
|
|
|
aa876b6 |
|
|
|
aa876b6 |
--- 2643,2649 ----
|
|
|
aa876b6 |
AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
|
|
|
aa876b6 |
AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
|
|
|
aa876b6 |
AC_MSG_RESULT(yes),
|
|
|
aa876b6 |
! AC_MSG_RESULT(no; xim has been disabled); enable_xim="no")
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
CPPFLAGS=$cppflags_save
|
|
|
aa876b6 |
|
|
|
aa876b6 |
*** ../vim-7.4.254/src/auto/configure 2014-04-10 11:09:11.684036810 +0200
|
|
|
aa876b6 |
--- src/auto/configure 2014-04-10 19:53:54.032105578 +0200
|
|
|
aa876b6 |
***************
|
|
|
aa876b6 |
*** 4637,4643 ****
|
|
|
aa876b6 |
$as_echo "yes" >&6; }
|
|
|
aa876b6 |
else
|
|
|
aa876b6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
aa876b6 |
! $as_echo "no" >&6; }; enable_smack = "no"
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
rm -f conftest*
|
|
|
aa876b6 |
|
|
|
aa876b6 |
--- 4637,4643 ----
|
|
|
aa876b6 |
$as_echo "yes" >&6; }
|
|
|
aa876b6 |
else
|
|
|
aa876b6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
aa876b6 |
! $as_echo "no" >&6; }; enable_smack="no"
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
rm -f conftest*
|
|
|
aa876b6 |
|
|
|
aa876b6 |
***************
|
|
|
aa876b6 |
*** 9303,9309 ****
|
|
|
aa876b6 |
$as_echo "yes" >&6; }
|
|
|
aa876b6 |
else
|
|
|
aa876b6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
|
|
|
aa876b6 |
! $as_echo "no; xim has been disabled" >&6; }; enable_xim = "no"
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
rm -f conftest*
|
|
|
aa876b6 |
|
|
|
aa876b6 |
--- 9303,9309 ----
|
|
|
aa876b6 |
$as_echo "yes" >&6; }
|
|
|
aa876b6 |
else
|
|
|
aa876b6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
|
|
|
aa876b6 |
! $as_echo "no; xim has been disabled" >&6; }; enable_xim="no"
|
|
|
aa876b6 |
fi
|
|
|
aa876b6 |
rm -f conftest*
|
|
|
aa876b6 |
|
|
|
aa876b6 |
*** ../vim-7.4.254/src/version.c 2014-04-10 11:09:11.684036810 +0200
|
|
|
aa876b6 |
--- src/version.c 2014-04-10 19:56:55.272105974 +0200
|
|
|
aa876b6 |
***************
|
|
|
aa876b6 |
*** 736,737 ****
|
|
|
aa876b6 |
--- 736,739 ----
|
|
|
aa876b6 |
{ /* Add new patch number below this line */
|
|
|
aa876b6 |
+ /**/
|
|
|
aa876b6 |
+ 255,
|
|
|
aa876b6 |
/**/
|
|
|
aa876b6 |
|
|
|
aa876b6 |
--
|
|
|
aa876b6 |
hundred-and-one symptoms of being an internet addict:
|
|
|
aa876b6 |
40. You tell the cab driver you live at
|
|
|
aa876b6 |
http://123.elm.street/house/bluetrim.html
|
|
|
aa876b6 |
41. You actually try that 123.elm.street address.
|
|
|
aa876b6 |
|
|
|
aa876b6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
aa876b6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
aa876b6 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
aa876b6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|