thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.798

Browse Source 
Problem:    MzScheme: circular list does not work correctly.
Solution:   Separate Mac-specific code from generic code. (Sergey Khorev)
This commit is contained in:
Bram Moolenaar
2013-01-31 21:09:15 +01:00
parent 04e5b5a228
commit 39d7d51bcd
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/if_mzsch.c
View File

@@ -965,6 +965,7 @@ startup_mzscheme(void)
#ifdef MZSCHEME_COLLECTS
/* setup 'current-library-collection-paths' parameter */
# if MZSCHEME_VERSION_MAJOR >= 299
# ifdef MACOS
{
Scheme_Object *coll_byte_string = NULL;
Scheme_Object *coll_char_string = NULL;
@@ -985,6 +986,36 @@ startup_mzscheme(void)
MZ_GC_CHECK();
MZ_GC_UNREG();
}
# else
{
Scheme_Object *coll_byte_string = NULL;
Scheme_Object *coll_char_string = NULL;
Scheme_Object *coll_path = NULL;
Scheme_Object *coll_pair = NULL;
Scheme_Config *config = NULL;
MZ_GC_DECL_REG(5);
MZ_GC_VAR_IN_REG(0, coll_byte_string);
MZ_GC_VAR_IN_REG(1, coll_char_string);
MZ_GC_VAR_IN_REG(2, coll_path);
MZ_GC_VAR_IN_REG(3, coll_pair);
MZ_GC_VAR_IN_REG(4, config);
MZ_GC_REG();
coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
MZ_GC_CHECK();
coll_char_string = scheme_byte_string_to_char_string(coll_byte_string);
MZ_GC_CHECK();
coll_path = scheme_char_string_to_path(coll_char_string);
MZ_GC_CHECK();
coll_pair = scheme_make_pair(coll_path, scheme_null);
MZ_GC_CHECK();
config = scheme_current_config();
MZ_GC_CHECK();
scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
MZ_GC_CHECK();
MZ_GC_UNREG();
}
# endif
# else
{
Scheme_Object *coll_string = NULL;

3
src/testdir/test70.in
View File

@@ -38,8 +38,7 @@ STARTTEST
:" circular list (at the same time test lists containing lists)
:mz (set-car! (cddr l) l)
:let l2 = mzeval("h")["list"]
:" bug: this returns item2, but it should be l2
:if l2[2] == "item2"
:if l2[2] == l2
:let res = "OK"
:else
:let res = "FAILED: " . l2[2]

2
src/version.c
View File

@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
798,
/**/
797,
/**/