summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-04-22 15:53:09 +0000
committerBram Moolenaar <Bram@vim.org>2009-04-22 15:53:09 +0000
commit94ba1ce055ca1e8dbabd65e0bcf43229e85258fc (patch)
treee8afbef2a9797a1aa97a79e9b2e0928c9f871a5e /src
parent92a990ba84e012033f881fd4a0bebad02933ac75 (diff)
downloadvim-git-94ba1ce055ca1e8dbabd65e0bcf43229e85258fc.tar.gz
updated for version 7.2-159v7.2.159
Diffstat (limited to 'src')
-rwxr-xr-xsrc/auto/configure2
-rw-r--r--src/configure.in2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index aea0013d4..889204283 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -15519,7 +15519,7 @@ fi
if test "$enable_multibyte" = "yes"; then
cflags_save=$CFLAGS
ldflags_save=$LDFLAGS
- if test -n "$x_includes" ; then
+ if test "x$x_includes" != "xNONE" ; then
CFLAGS="$CFLAGS -I$x_includes"
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
{ $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
diff --git a/src/configure.in b/src/configure.in
index ff1bd0c9c..682141722 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2952,7 +2952,7 @@ dnl Check if X_LOCALE should be defined.
if test "$enable_multibyte" = "yes"; then
cflags_save=$CFLAGS
ldflags_save=$LDFLAGS
- if test -n "$x_includes" ; then
+ if test "x$x_includes" != "xNONE" ; then
CFLAGS="$CFLAGS -I$x_includes"
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
AC_MSG_CHECKING(whether X_LOCALE needed)
diff --git a/src/version.c b/src/version.c
index e5e1307fc..0253013fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 159,
+/**/
158,
/**/
157,