# HG changeset patch # User Bram Moolenaar # Date 1397152815 -7200 # Node ID 5595506b985a198abae41ab0150ee50b8bf1686c # Parent c876b0d76b7cf6e21d277d88eb9c9882e6e7ae36 updated for version 7.4.255 Problem: Configure check for smack doesn't work with all shells. (David Larson) Solution: Remove spaces in set command. diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -4637,7 +4637,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; enable_smack = "no" +$as_echo "no" >&6; }; enable_smack="no" fi rm -f conftest* @@ -9303,7 +9303,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 -$as_echo "no; xim has been disabled" >&6; }; enable_xim = "no" +$as_echo "no; xim has been disabled" >&6; }; enable_xim="no" fi rm -f conftest* diff --git a/src/configure.in b/src/configure.in --- a/src/configure.in +++ b/src/configure.in @@ -405,7 +405,7 @@ if test "$enable_smack" = "yes"; then AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h) AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include ], AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); enable_smack = "no") + AC_MSG_RESULT(no); enable_smack="no") fi if test "$enable_smack" = "yes"; then AC_CHECK_LIB(attr, setxattr, @@ -2643,7 +2643,7 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_N AC_MSG_CHECKING(for XIMText in X11/Xlib.h) AC_EGREP_CPP(XIMText, [#include ], AC_MSG_RESULT(yes), - AC_MSG_RESULT(no; xim has been disabled); enable_xim = "no") + AC_MSG_RESULT(no; xim has been disabled); enable_xim="no") fi CPPFLAGS=$cppflags_save diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 255, +/**/ 254, /**/ 253,