]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-021 v7.1.021
authorBram Moolenaar <Bram@vim.org>
Fri, 6 Jul 2007 17:43:08 +0000 (17:43 +0000)
committerBram Moolenaar <Bram@vim.org>
Fri, 6 Jul 2007 17:43:08 +0000 (17:43 +0000)
src/if_mzsch.c
src/version.c

index 9efb621843f50aa3769eac56bfea524daee7a402..28bf53def880f7603e94658c1f3fba554cdbecf1 100644 (file)
@@ -308,6 +308,8 @@ static void (*dll_scheme_set_param)(Scheme_Config *c, int pos,
 static Scheme_Config *(*dll_scheme_current_config)(void);
 static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
     (Scheme_Object *s);
+static Scheme_Object *(*dll_scheme_char_string_to_path)
+    (Scheme_Object *s);
 # endif
 
 /* arrays are imported directly */
@@ -398,6 +400,8 @@ static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
 #  define scheme_current_config dll_scheme_current_config
 #  define scheme_char_string_to_byte_string \
     dll_scheme_char_string_to_byte_string
+#  define scheme_char_string_to_path \
+    dll_scheme_char_string_to_path
 # endif
 
 typedef struct
@@ -498,6 +502,8 @@ static Thunk_Info mzsch_imports[] = {
     {"scheme_current_config", (void **)&dll_scheme_current_config},
     {"scheme_char_string_to_byte_string",
        (void **)&dll_scheme_char_string_to_byte_string},
+    {"scheme_char_string_to_path",
+       (void **)&dll_scheme_char_string_to_path},
 # endif
     {NULL, NULL}};
 
@@ -773,7 +779,15 @@ startup_mzscheme(void)
 #ifdef MZSCHEME_COLLECTS
     /* setup 'current-library-collection-paths' parameter */
     scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
-           scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
+           scheme_make_pair(
+# if MZSCHEME_VERSION_MAJOR >= 299
+               scheme_char_string_to_path(
+                   scheme_byte_string_to_char_string(
+                       scheme_make_byte_string(MZSCHEME_COLLECTS))),
+# else
+               scheme_make_string(MZSCHEME_COLLECTS),
+# endif
+               scheme_null));
 #endif
 #ifdef HAVE_SANDBOX
     /* setup sandbox guards */
index b72c713cd70b4dbb68306472229a481c37e6404a..3772ef6cb38713f27cd25a601e1ccbce17ccb52b 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/