summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-10-17 09:49:09 +0000
committerBram Moolenaar <Bram@vim.org>2006-10-17 09:49:09 +0000
commitb90daee952fb33edca3b844af62a2bc72f68316e (patch)
treec5eebe9af3150339bb997a18b5c7536527386faa
parente163f1cb99d99fcd6368a2d1e39b1d1c53fb72e1 (diff)
downloadvim-git-b90daee952fb33edca3b844af62a2bc72f68316e.tar.gz
updated for version 7.0-137v7.0.137
-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 c941bc0db..43c161bdf 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -15302,7 +15302,7 @@ if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
&& test "x$GUITYPE" != "xCARBONGUI"; then
echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5
echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6
- if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
+ if test "x$enable_multibyte" = "xyes" || test "x$features" = "xbig" \
|| test "x$features" = "xhuge"; then
LIBS="$LIBS -framework Carbon"
echo "$as_me:$LINENO: result: yes" >&5
diff --git a/src/configure.in b/src/configure.in
index 9842fff8a..66f629521 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2838,7 +2838,7 @@ if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
&& test "x$GUITYPE" != "xCARBONGUI"; then
AC_MSG_CHECKING(whether we need -framework Carbon)
dnl check for MACOSX without Carbon GUI, but with FEAT_MBYTE
- if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
+ if test "x$enable_multibyte" = "xyes" || test "x$features" = "xbig" \
|| test "x$features" = "xhuge"; then
LIBS="$LIBS -framework Carbon"
AC_MSG_RESULT(yes)
diff --git a/src/version.c b/src/version.c
index f442ba30a..68e2c4fc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 137,
+/**/
136,
/**/
135,