Mirror of the Vim source from https://github.com/vim/vim
Revisão | 66ddf49935fb8979def275bcf7c56acdfac7ef6d (tree) |
---|---|
Hora | 2007-06-28 20:07:21 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-015
@@ -3843,7 +3843,9 @@ | ||
3843 | 3843 | fi |
3844 | 3844 | |
3845 | 3845 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then |
3846 | - if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
3846 | + if test "x$MACOSX" = "xyes"; then | |
3847 | + MZSCHEME_LIBS="-framework PLT_MzScheme" | |
3848 | + elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
3847 | 3849 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" |
3848 | 3850 | else |
3849 | 3851 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" |
@@ -423,7 +423,9 @@ | ||
423 | 423 | fi |
424 | 424 | |
425 | 425 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then |
426 | - if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
426 | + if test "x$MACOSX" = "xyes"; then | |
427 | + MZSCHEME_LIBS="-framework PLT_MzScheme" | |
428 | + elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
427 | 429 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" |
428 | 430 | else |
429 | 431 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" |
@@ -773,8 +773,7 @@ | ||
773 | 773 | #ifdef MZSCHEME_COLLECTS |
774 | 774 | /* setup 'current-library-collection-paths' parameter */ |
775 | 775 | scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS, |
776 | - scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS), | |
777 | - scheme_null)); | |
776 | + scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS))); | |
778 | 777 | #endif |
779 | 778 | #ifdef HAVE_SANDBOX |
780 | 779 | /* setup sandbox guards */ |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 15, | |
671 | +/**/ | |
670 | 672 | 14, |
671 | 673 | /**/ |
672 | 674 | 13, |