From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2007 11:07:21 +0000 (+0000)
Subject: updated for version 7.1-015
X-Git-Tag: v7.1.015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f15f943e0c3daad54fc76c01a3dbbe2a4f8d2087;p=vim

updated for version 7.1-015
---

diff --git a/src/auto/configure b/src/auto/configure
index f976f51fc..3d94de5fb 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -3843,7 +3843,9 @@ echo "${ECHO_T}\"no\"" >&6
   fi
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
-    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    if test "x$MACOSX" = "xyes"; then
+      MZSCHEME_LIBS="-framework PLT_MzScheme"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
diff --git a/src/configure.in b/src/configure.in
index 254ca0da6..7514eb357 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -423,7 +423,9 @@ if test "$enable_mzschemeinterp" = "yes"; then
   fi
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
-    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    if test "x$MACOSX" = "xyes"; then
+      MZSCHEME_LIBS="-framework PLT_MzScheme"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 1f13e833f..9efb62184 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -773,8 +773,7 @@ startup_mzscheme(void)
 #ifdef MZSCHEME_COLLECTS
     /* setup 'current-library-collection-paths' parameter */
     scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
-	    scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS),
-		scheme_null));
+	    scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
 #endif
 #ifdef HAVE_SANDBOX
     /* setup sandbox guards */
diff --git a/src/version.c b/src/version.c
index 05d09caf9..b68beb09b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    15,
 /**/
     14,
 /**/