|
 |
05652fe |
To: vim-dev@vim.org
|
|
|
05652fe |
Subject: patch 7.1.015
|
|
|
05652fe |
Fcc: outbox
|
|
|
05652fe |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
05652fe |
Mime-Version: 1.0
|
|
|
05652fe |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
05652fe |
Content-Transfer-Encoding: 8bit
|
|
|
05652fe |
------------
|
|
|
05652fe |
|
|
|
05652fe |
Patch 7.1.015
|
|
|
05652fe |
Problem: MzScheme interface: current-library-collection-paths produces no
|
|
|
05652fe |
list. Interface doesn't build on a Mac.
|
|
|
05652fe |
Solution: Use a list instead of a pair. (Bernhard Fisseni) Use "-framework"
|
|
|
05652fe |
argument for MZSCHEME_LIBS in configure.
|
|
|
05652fe |
Files: src/configure.in, src/if_mzsch.c, src/auto/configure
|
|
|
05652fe |
|
|
|
05652fe |
|
|
|
05652fe |
*** ../vim-7.1.014/src/configure.in Sat May 12 16:30:49 2007
|
|
|
05652fe |
--- src/configure.in Sun Jun 10 16:47:43 2007
|
|
|
05652fe |
***************
|
|
|
05652fe |
*** 423,429 ****
|
|
|
05652fe |
fi
|
|
|
05652fe |
|
|
|
05652fe |
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
|
|
|
05652fe |
! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
|
|
|
05652fe |
MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
|
|
|
05652fe |
else
|
|
|
05652fe |
MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
|
|
|
05652fe |
--- 423,431 ----
|
|
|
05652fe |
fi
|
|
|
05652fe |
|
|
|
05652fe |
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
|
|
|
05652fe |
! if test "x$MACOSX" = "xyes"; then
|
|
|
05652fe |
! MZSCHEME_LIBS="-framework PLT_MzScheme"
|
|
|
05652fe |
! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
|
|
|
05652fe |
MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
|
|
|
05652fe |
else
|
|
|
05652fe |
MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
|
|
|
05652fe |
*** ../vim-7.1.014/src/if_mzsch.c Sat May 12 17:29:20 2007
|
|
|
05652fe |
--- src/if_mzsch.c Sun Jun 10 16:39:51 2007
|
|
|
05652fe |
***************
|
|
|
05652fe |
*** 773,780 ****
|
|
|
05652fe |
#ifdef MZSCHEME_COLLECTS
|
|
|
05652fe |
/* setup 'current-library-collection-paths' parameter */
|
|
|
05652fe |
scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
|
|
|
05652fe |
! scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS),
|
|
|
05652fe |
! scheme_null));
|
|
|
05652fe |
#endif
|
|
|
05652fe |
#ifdef HAVE_SANDBOX
|
|
|
05652fe |
/* setup sandbox guards */
|
|
|
05652fe |
--- 773,779 ----
|
|
|
05652fe |
#ifdef MZSCHEME_COLLECTS
|
|
|
05652fe |
/* setup 'current-library-collection-paths' parameter */
|
|
|
05652fe |
scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
|
|
|
05652fe |
! scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
|
|
|
05652fe |
#endif
|
|
|
05652fe |
#ifdef HAVE_SANDBOX
|
|
|
05652fe |
/* setup sandbox guards */
|
|
|
05652fe |
*** ../vim-7.1.014/src/auto/configure Sat May 12 16:23:27 2007
|
|
|
05652fe |
--- src/auto/configure Sun Jun 10 16:49:58 2007
|
|
|
05652fe |
***************
|
|
|
05652fe |
*** 3843,3849 ****
|
|
|
05652fe |
fi
|
|
|
05652fe |
|
|
|
05652fe |
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
|
|
|
05652fe |
! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
|
|
|
05652fe |
MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
|
|
|
05652fe |
else
|
|
|
05652fe |
MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
|
|
|
05652fe |
--- 3843,3851 ----
|
|
|
05652fe |
fi
|
|
|
05652fe |
|
|
|
05652fe |
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
|
|
|
05652fe |
! if test "x$MACOSX" = "xyes"; then
|
|
|
05652fe |
! MZSCHEME_LIBS="-framework PLT_MzScheme"
|
|
|
05652fe |
! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
|
|
|
05652fe |
MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
|
|
|
05652fe |
else
|
|
|
05652fe |
MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
|
|
|
05652fe |
*** ../vim-7.1.014/src/version.c Thu Jun 28 12:44:56 2007
|
|
|
05652fe |
--- src/version.c Thu Jun 28 13:00:52 2007
|
|
|
05652fe |
***************
|
|
|
05652fe |
*** 668,669 ****
|
|
|
05652fe |
--- 668,671 ----
|
|
|
05652fe |
{ /* Add new patch number below this line */
|
|
|
05652fe |
+ /**/
|
|
|
05652fe |
+ 15,
|
|
|
05652fe |
/**/
|
|
|
05652fe |
|
|
|
05652fe |
--
|
|
|
05652fe |
You know you use Vim too much when you have this alias in your
|
|
|
05652fe |
~/.bashrc file: alias :e=/bin/vim (Eljay Love-Jensen)
|
|
|
05652fe |
|
|
|
05652fe |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
05652fe |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
05652fe |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
05652fe |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|