To: vim_dev@googlegroups.com

Subject: Patch 7.3.791

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.791

Problem:    MzScheme interface doesn't work propely.

Solution:   Make it work better. (Sergey Khorev)

Files:	    runtime/doc/if_mzsch.txt, src/configure.in, src/auto/configure,

	    src/eval.c, src/if_mzsch.c, src/if_mzsch.h, src/Make_ming.mak,

	    src/Make_mvc.mak, src/os_unix.c, src/proto/eval.pro,

	    src/testdir/test70.in, src/testdir/test70.ok

*** ../vim-7.3.790/runtime/doc/if_mzsch.txt	2010-08-15 21:57:14.000000000 +0200

--- runtime/doc/if_mzsch.txt	2013-01-30 14:26:44.000000000 +0100

***************

*** 11,17 ****

  3. Threads				|mzscheme-threads|

  4. Vim access from MzScheme		|mzscheme-vim|

  5. mzeval() Vim function		|mzscheme-mzeval|

! 6. Dynamic loading			|mzscheme-dynamic|

  {Vi does not have any of these commands}

--- 11,18 ----

  3. Threads				|mzscheme-threads|

  4. Vim access from MzScheme		|mzscheme-vim|

  5. mzeval() Vim function		|mzscheme-mzeval|

! 6. Using Function references		|mzscheme-funcref|

! 7. Dynamic loading			|mzscheme-dynamic|

  {Vi does not have any of these commands}

***************

*** 21,30 ****

  Based on the work of Brent Fulgham.

  Dynamic loading added by Sergey Khorev

! For downloading MzScheme and other info:

! 	http://www.plt-scheme.org/software/mzscheme/

! Note: On FreeBSD you should use the "drscheme" port.

  ==============================================================================

  1. Commands						*mzscheme-commands*

--- 22,38 ----

  Based on the work of Brent Fulgham.

  Dynamic loading added by Sergey Khorev

! MzScheme and PLT Scheme names have been rebranded as Racket. For more

! information please check http://racket-lang.org

! Futures and places of Racket version 5.x up to and including 5.3.1 do not

! work correctly with processes created by Vim.

! The simplest solution is to build Racket on your own with these features

! disabled: >

!   ./configure --disable-futures --disable-places --prefix=your-install-prefix

! 

! To speed up the process, you might also want to use --disable-gracket and

! --disable-docs

  ==============================================================================

  1. Commands						*mzscheme-commands*

***************

*** 155,162 ****

      (eval {expr-string})	    Evaluate the vim expression into

  				    respective MzScheme object: |Lists| are

  				    represented as Scheme lists,

! 				    |Dictionaries| as hash tables.

! 				    NOTE the name clashes with MzScheme eval

      (range-start)		    Start/End of the range passed with

      (range-end)			    the Scheme command.

      (beep)			    beep

--- 163,173 ----

      (eval {expr-string})	    Evaluate the vim expression into

  				    respective MzScheme object: |Lists| are

  				    represented as Scheme lists,

! 				    |Dictionaries| as hash tables,

! 				    |Funcref|s as functions (see also

! 				    |mzscheme-funcref|)

! 				    NOTE the name clashes with MzScheme eval,

! 				    use module qualifiers to overcome this.

      (range-start)		    Start/End of the range passed with

      (range-end)			    the Scheme command.

      (beep)			    beep

***************

*** 237,243 ****

  evaluate MzScheme expressions and pass their values to VimL.

  ==============================================================================

! 6. Dynamic loading				    *mzscheme-dynamic* *E815*

  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|

  output then includes |+mzscheme/dyn|.

--- 248,270 ----

  evaluate MzScheme expressions and pass their values to VimL.

  ==============================================================================

! 6. Using Function references				    *mzscheme-funcref*

! 

! MzScheme interface allows use of |Funcref|s so you can call Vim functions

! directly from Scheme. For instance: >

!     function! MyAdd2(arg)

! 	return a:arg + 2

!     endfunction

!     mz (define f2 (vim-eval "function(\"MyAdd2\")"))

!     mz (f2 7)

! < or : >

!     :mz (define indent (vim-eval "function('indent')"))

!     " return Vim indent for line 12

!     :mz (indent 12)

! <

! 

! ==============================================================================

! 7. Dynamic loading				    *mzscheme-dynamic* *E815*

  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|

  output then includes |+mzscheme/dyn|.

*** ../vim-7.3.790/src/configure.in	2012-12-12 14:25:01.000000000 +0100

--- src/configure.in	2013-01-30 14:26:44.000000000 +0100

***************

*** 617,623 ****

    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then

      if test "x$MACOSX" = "xyes"; then

!       MZSCHEME_LIBS="-framework PLT_MzScheme"

      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then

        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"

        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

--- 617,624 ----

    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then

      if test "x$MACOSX" = "xyes"; then

!       MZSCHEME_LIBS="-framework Racket"

!       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then

        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"

        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

***************

*** 660,665 ****

--- 661,670 ----

        else

  	if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then

  	  SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/

+ 	else

+ 	  if test -d $vi_cv_path_mzscheme_pfx/collects; then

+ 	    SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/

+ 	  fi

  	fi

        fi

      fi

*** ../vim-7.3.790/src/auto/configure	2012-12-12 14:25:01.000000000 +0100

--- src/auto/configure	2013-01-30 14:27:31.000000000 +0100

***************

*** 4927,4933 ****

    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then

      if test "x$MACOSX" = "xyes"; then

!       MZSCHEME_LIBS="-framework PLT_MzScheme"

      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then

        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"

        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

--- 4927,4934 ----

    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then

      if test "x$MACOSX" = "xyes"; then

!       MZSCHEME_LIBS="-framework Racket"

!       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then

        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"

        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"

***************

*** 4968,4973 ****

--- 4969,4978 ----

        else

  	if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then

  	  SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/

+ 	else

+ 	  if test -d $vi_cv_path_mzscheme_pfx/collects; then

+ 	    SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/

+ 	  fi

  	fi

        fi

      fi

*** ../vim-7.3.790/src/eval.c	2013-01-23 17:15:25.000000000 +0100

--- src/eval.c	2013-01-30 14:33:00.000000000 +0100

***************

*** 14333,14338 ****

--- 14333,14354 ----

      str = get_tv_string_buf(&argvars[0], buf);

      do_mzeval(str, rettv);

  }

+ 

+     void

+ mzscheme_call_vim(name, args, rettv)

+     char_u	*name;

+     typval_T	*args;

+     typval_T	*rettv;

+ {

+     typval_T argvars[3];

+ 

+     argvars[0].v_type = VAR_STRING;

+     argvars[0].vval.v_string = name;

+     copy_tv(args, &argvars[1]);

+     argvars[2].v_type = VAR_UNKNOWN;

+     f_call(argvars, rettv);

+     clear_tv(&argvars[1]);

+ }

  #endif

  /*

*** ../vim-7.3.790/src/if_mzsch.c	2012-11-28 15:37:46.000000000 +0100

--- src/if_mzsch.c	2013-01-30 14:34:37.000000000 +0100

***************

*** 1,11 ****

  /* vi:set ts=8 sts=4 sw=4:

   *

   * MzScheme interface by Sergey Khorev <sergey.khorev@gmail.com>

!  * Original work by Brent Fulgham <bfulgham@debian.org>

   * (Based on lots of help from Matthew Flatt)

   *

-  * TODO Convert byte-strings to char strings?

-  *

   * This consists of six parts:

   * 1. MzScheme interpreter main program

   * 2. Routines that handle the external interface between MzScheme and

--- 1,9 ----

  /* vi:set ts=8 sts=4 sw=4:

   *

   * MzScheme interface by Sergey Khorev <sergey.khorev@gmail.com>

!  * Based on work by Brent Fulgham <bfulgham@debian.org>

   * (Based on lots of help from Matthew Flatt)

   *

   * This consists of six parts:

   * 1. MzScheme interpreter main program

   * 2. Routines that handle the external interface between MzScheme and

***************

*** 142,148 ****

  static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);

  static void startup_mzscheme(void);

  static char *string_to_line(Scheme_Object *obj);

! static void do_output(char *mesg, intptr_t len);

  static void do_printf(char *format, ...);

  static void do_flush(void);

  static Scheme_Object *_apply_thunk_catch_exceptions(

--- 140,151 ----

  static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);

  static void startup_mzscheme(void);

  static char *string_to_line(Scheme_Object *obj);

! #if MZSCHEME_VERSION_MAJOR >= 500

! # define OUTPUT_LEN_TYPE intptr_t

! #else

! # define OUTPUT_LEN_TYPE long

! #endif

! static void do_output(char *mesg, OUTPUT_LEN_TYPE len);

  static void do_printf(char *format, ...);

  static void do_flush(void);

  static Scheme_Object *_apply_thunk_catch_exceptions(

***************

*** 166,175 ****

  static int mzscheme_env_main(Scheme_Env *env, int argc, char **argv);

  static int mzscheme_init(void);

  #ifdef FEAT_EVAL

! static Scheme_Object *vim_to_mzscheme(typval_T *vim_value, int depth,

  	Scheme_Hash_Table *visited);

! static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,

  	Scheme_Hash_Table *visited);

  #endif

  #ifdef MZ_PRECISE_GC

--- 169,181 ----

  static int mzscheme_env_main(Scheme_Env *env, int argc, char **argv);

  static int mzscheme_init(void);

  #ifdef FEAT_EVAL

! static Scheme_Object *vim_to_mzscheme(typval_T *vim_value);

! static Scheme_Object *vim_to_mzscheme_impl(typval_T *vim_value, int depth,

  	Scheme_Hash_Table *visited);

! static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv);

! static int mzscheme_to_vim_impl(Scheme_Object *obj, typval_T *tv, int depth,

  	Scheme_Hash_Table *visited);

+ static Scheme_Object *vim_funcref(void *data, int argc, Scheme_Object **argv);

  #endif

  #ifdef MZ_PRECISE_GC

***************

*** 183,188 ****

--- 189,201 ----

  }

  static int buffer_fixup_proc(void *obj)

  {

+     /* apparently not needed as the object will be uncollectable while

+      * the buffer is alive

+      */

+     /*

+     vim_mz_buffer* buf = (vim_mz_buffer*) obj;

+     buf->buf->b_mzscheme_ref = GC_fixup_self(obj);

+     */

      return buffer_size_proc(obj);

  }

  static int window_size_proc(void *obj UNUSED)

***************

*** 195,206 ****

  }

  static int window_fixup_proc(void *obj)

  {

      return window_size_proc(obj);

  }

  #endif

  #ifdef DYNAMIC_MZSCHEME

- 

  static Scheme_Object *dll_scheme_eof;

  static Scheme_Object *dll_scheme_false;

  static Scheme_Object *dll_scheme_void;

--- 208,233 ----

  }

  static int window_fixup_proc(void *obj)

  {

+     /* apparently not needed as the object will be uncollectable while

+      * the window is alive

+      */

+     /*

+     vim_mz_window* win = (vim_mz_window*) obj;

+     win->win->w_mzscheme_ref = GC_fixup_self(obj);

+     */

      return window_size_proc(obj);

  }

+ /* with precise GC, w_mzscheme_ref and b_mzscheme_ref are immobile boxes

+  * containing pointers to a window/buffer

+  * with conservative GC these are simply pointers*/

+ # define WINDOW_REF(win) *(vim_mz_window **)((win)->w_mzscheme_ref)

+ # define BUFFER_REF(buf) *(vim_mz_buffer **)((buf)->b_mzscheme_ref)

+ #else

+ # define WINDOW_REF(win) (vim_mz_window *)((win)->w_mzscheme_ref)

+ # define BUFFER_REF(buf) (vim_mz_buffer *)((buf)->b_mzscheme_ref)

  #endif

  #ifdef DYNAMIC_MZSCHEME

  static Scheme_Object *dll_scheme_eof;

  static Scheme_Object *dll_scheme_false;

  static Scheme_Object *dll_scheme_void;

***************

*** 319,324 ****

--- 346,352 ----

      (Scheme_Object *s);

  static Scheme_Object *(*dll_scheme_char_string_to_path)

      (Scheme_Object *s);

+ static void *(*dll_scheme_set_collects_path)(Scheme_Object *p);

  # endif

  static Scheme_Hash_Table *(*dll_scheme_make_hash_table)(int type);

  static void (*dll_scheme_hash_set)(Scheme_Hash_Table *table,

***************

*** 378,388 ****

  # endif

  # define scheme_gc_ptr_ok dll_scheme_gc_ptr_ok

  # if MZSCHEME_VERSION_MAJOR < 299

! #  define scheme_get_sized_string_output dll_scheme_get_sized_string_output

  # else

  #  define scheme_get_sized_byte_string_output \

      dll_scheme_get_sized_byte_string_output

! # define scheme_get_param dll_scheme_get_param

  # endif

  # define scheme_intern_symbol dll_scheme_intern_symbol

  # define scheme_lookup_global dll_scheme_lookup_global

--- 406,416 ----

  # endif

  # define scheme_gc_ptr_ok dll_scheme_gc_ptr_ok

  # if MZSCHEME_VERSION_MAJOR < 299

! #  define scheme_get_sized_byte_string_output dll_scheme_get_sized_string_output

  # else

  #  define scheme_get_sized_byte_string_output \

      dll_scheme_get_sized_byte_string_output

! #  define scheme_get_param dll_scheme_get_param

  # endif

  # define scheme_intern_symbol dll_scheme_intern_symbol

  # define scheme_lookup_global dll_scheme_lookup_global

***************

*** 391,398 ****

  # define scheme_make_pair dll_scheme_make_pair

  # define scheme_make_prim_w_arity dll_scheme_make_prim_w_arity

  # if MZSCHEME_VERSION_MAJOR < 299

! #  define scheme_make_string dll_scheme_make_string

! #  define scheme_make_string_output_port dll_scheme_make_string_output_port

  # else

  #  define scheme_make_byte_string dll_scheme_make_byte_string

  #  define scheme_make_byte_string_output_port \

--- 419,426 ----

  # define scheme_make_pair dll_scheme_make_pair

  # define scheme_make_prim_w_arity dll_scheme_make_prim_w_arity

  # if MZSCHEME_VERSION_MAJOR < 299

! #  define scheme_make_byte_string dll_scheme_make_string

! #  define scheme_make_byte_string_output_port dll_scheme_make_string_output_port

  # else

  #  define scheme_make_byte_string dll_scheme_make_byte_string

  #  define scheme_make_byte_string_output_port \

***************

*** 421,426 ****

--- 449,455 ----

      dll_scheme_char_string_to_byte_string

  #  define scheme_char_string_to_path \

      dll_scheme_char_string_to_path

+ #  define scheme_set_collects_path dll_scheme_set_collects_path

  # endif

  # define scheme_make_hash_table dll_scheme_make_hash_table

  # define scheme_hash_set dll_scheme_hash_set

***************

*** 529,534 ****

--- 558,564 ----

      {"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},

+     {"scheme_set_collects_path", (void **)&dll_scheme_set_collects_path},

  # endif

      {"scheme_make_hash_table", (void **)&dll_scheme_make_hash_table},

      {"scheme_hash_set", (void **)&dll_scheme_hash_set},

***************

*** 625,635 ****

  }

  #endif /* DYNAMIC_MZSCHEME */

  /* need to put it here for dynamic stuff to work */

  #if defined(INCLUDE_MZSCHEME_BASE)

  # include "mzscheme_base.c"

  #elif MZSCHEME_VERSION_MAJOR >= 400

! # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes

  #endif

  /*

--- 655,694 ----

  }

  #endif /* DYNAMIC_MZSCHEME */

+ #if MZSCHEME_VERSION_MAJOR < 299

+ # define GUARANTEED_STRING_ARG(proc, num) GUARANTEE_STRING(proc, num)

+ #else

+     static Scheme_Object *

+ guaranteed_byte_string_arg(char *proc, int num, int argc, Scheme_Object **argv)

+ {

+     if (SCHEME_BYTE_STRINGP(argv[num]))

+     {

+ 	return argv[num];

+     }

+     else if (SCHEME_CHAR_STRINGP(argv[num]))

+     {

+ 	Scheme_Object *tmp = NULL;

+ 	MZ_GC_DECL_REG(2);

+ 	MZ_GC_VAR_IN_REG(0, argv[num]);

+ 	MZ_GC_VAR_IN_REG(1, tmp);

+ 	MZ_GC_REG();

+ 	tmp = scheme_char_string_to_byte_string(argv[num]);

+ 	MZ_GC_UNREG();

+ 	return tmp;

+     }

+     else

+ 	scheme_wrong_type(proc, "string", num, argc, argv);

+     /* unreachable */

+     return scheme_void;

+ }

+ # define GUARANTEED_STRING_ARG(proc, num) guaranteed_byte_string_arg(proc, num, argc, argv)

+ #endif

+ 

  /* need to put it here for dynamic stuff to work */

  #if defined(INCLUDE_MZSCHEME_BASE)

  # include "mzscheme_base.c"

  #elif MZSCHEME_VERSION_MAJOR >= 400

! # error MzScheme >=4 must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes

  #endif

  /*

***************

*** 861,866 ****

--- 920,930 ----

      scheme_set_stack_base(stack_base, 1);

  #endif

+ #ifndef TRAMPOLINED_MZVIM_STARTUP

+     /* in newer versions of precise GC the initial env has been created */

+     environment = scheme_basic_env();

+ #endif

+ 

      MZ_REGISTER_STATIC(environment);

      MZ_REGISTER_STATIC(curout);

      MZ_REGISTER_STATIC(curerr);

***************

*** 869,878 ****

      MZ_REGISTER_STATIC(exn_message);

      MZ_REGISTER_STATIC(vim_exn);

- #ifndef TRAMPOLINED_MZVIM_STARTUP

-     /* in newer versions of precise GC the initial env has been created */

-     environment = scheme_basic_env();

- #endif

      MZ_GC_CHECK();

  #ifdef INCLUDE_MZSCHEME_BASE

--- 933,938 ----

***************

*** 909,923 ****

  	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();

--- 969,979 ----

  	Scheme_Object	*coll_byte_string = NULL;

  	Scheme_Object	*coll_char_string = NULL;

  	Scheme_Object	*coll_path = NULL;

! 	MZ_GC_DECL_REG(3);

  	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_REG();

  	coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);

  	MZ_GC_CHECK();

***************

*** 925,935 ****

  	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_config;

! 	MZ_GC_CHECK();

! 	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);

  	MZ_GC_CHECK();

  	MZ_GC_UNREG();

      }

--- 981,987 ----

  	MZ_GC_CHECK();

  	coll_path = scheme_char_string_to_path(coll_char_string);

  	MZ_GC_CHECK();

! 	scheme_set_collects_path(coll_path);

  	MZ_GC_CHECK();

  	MZ_GC_UNREG();

      }

***************

*** 944,954 ****

  	MZ_GC_VAR_IN_REG(1, coll_pair);

  	MZ_GC_VAR_IN_REG(2, config);

  	MZ_GC_REG();

! 	coll_string = scheme_make_string(MZSCHEME_COLLECTS);

  	MZ_GC_CHECK();

  	coll_pair = scheme_make_pair(coll_string, scheme_null);

  	MZ_GC_CHECK();

! 	config = scheme_config;

  	MZ_GC_CHECK();

  	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);

  	MZ_GC_CHECK();

--- 996,1006 ----

  	MZ_GC_VAR_IN_REG(1, coll_pair);

  	MZ_GC_VAR_IN_REG(2, config);

  	MZ_GC_REG();

! 	coll_string = scheme_make_byte_string(MZSCHEME_COLLECTS);

  	MZ_GC_CHECK();

  	coll_pair = scheme_make_pair(coll_string, scheme_null);

  	MZ_GC_CHECK();

! 	config = scheme_current_config();

  	MZ_GC_CHECK();

  	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);

  	MZ_GC_CHECK();

***************

*** 991,997 ****

  	    MZ_GC_VAR_IN_REG(3, guard);

  	    MZ_GC_VAR_IN_REG(4, config);

  	    MZ_GC_REG();

! 	    config = scheme_config;

  	    MZ_GC_CHECK();

  	    args[0] = scheme_get_param(config, MZCONFIG_SECURITY_GUARD);

  	    MZ_GC_CHECK();

--- 1043,1049 ----

  	    MZ_GC_VAR_IN_REG(3, guard);

  	    MZ_GC_VAR_IN_REG(4, config);

  	    MZ_GC_REG();

! 	    config = scheme_current_config();

  	    MZ_GC_CHECK();

  	    args[0] = scheme_get_param(config, MZCONFIG_SECURITY_GUARD);

  	    MZ_GC_CHECK();

***************

*** 1055,1066 ****

  	MZ_GC_DECL_REG(1);

  	MZ_GC_VAR_IN_REG(0, config);

  	MZ_GC_REG();

! 	config = scheme_config;

  	MZ_GC_CHECK();

  	/* recreate ports each call effectively clearing these ones */

! 	curout = scheme_make_string_output_port();

  	MZ_GC_CHECK();

! 	curerr = scheme_make_string_output_port();

  	MZ_GC_CHECK();

  	scheme_set_param(config, MZCONFIG_OUTPUT_PORT, curout);

  	MZ_GC_CHECK();

--- 1107,1118 ----

  	MZ_GC_DECL_REG(1);

  	MZ_GC_VAR_IN_REG(0, config);

  	MZ_GC_REG();

! 	config = scheme_current_config();

  	MZ_GC_CHECK();

  	/* recreate ports each call effectively clearing these ones */

! 	curout = scheme_make_byte_string_output_port();

  	MZ_GC_CHECK();

! 	curerr = scheme_make_byte_string_output_port();

  	MZ_GC_CHECK();

  	scheme_set_param(config, MZCONFIG_OUTPUT_PORT, curout);

  	MZ_GC_CHECK();

***************

*** 1149,1161 ****

  {

      if (buf->b_mzscheme_ref)

      {

! 	vim_mz_buffer *bp;

! 	bp = buf->b_mzscheme_ref;

  	bp->buf = INVALID_BUFFER_VALUE;

! 	buf->b_mzscheme_ref = NULL;

  	scheme_gc_ptr_ok(bp);

  	MZ_GC_CHECK();

      }

  }

--- 1201,1221 ----

  {

      if (buf->b_mzscheme_ref)

      {

! 	vim_mz_buffer *bp = NULL;

! 	MZ_GC_DECL_REG(1);

! 	MZ_GC_VAR_IN_REG(0, bp);

! 	MZ_GC_REG();

! 	bp = BUFFER_REF(buf);

  	bp->buf = INVALID_BUFFER_VALUE;

! #ifndef MZ_PRECISE_GC

  	scheme_gc_ptr_ok(bp);

+ #else

+ 	scheme_free_immobile_box(buf->b_mzscheme_ref);

+ #endif

+ 	buf->b_mzscheme_ref = NULL;

  	MZ_GC_CHECK();

+ 	MZ_GC_UNREG();

      }

  }

***************

*** 1167,1178 ****

  {

      if (win->w_mzscheme_ref)

      {

! 	vim_mz_window *wp;

! 	wp = win->w_mzscheme_ref;

  	wp->win = INVALID_WINDOW_VALUE;

! 	win->w_mzscheme_ref = NULL;

  	scheme_gc_ptr_ok(wp);

  	MZ_GC_CHECK();

      }

  }

--- 1227,1246 ----

  {

      if (win->w_mzscheme_ref)

      {

! 	vim_mz_window *wp = NULL;

! 	MZ_GC_DECL_REG(1);

! 	MZ_GC_VAR_IN_REG(0, wp);

! 	MZ_GC_REG();

! 	wp = WINDOW_REF(win);

  	wp->win = INVALID_WINDOW_VALUE;

! #ifndef MZ_PRECISE_GC

  	scheme_gc_ptr_ok(wp);

+ #else

+ 	scheme_free_immobile_box(win->w_mzscheme_ref);

+ #endif

+ 	win->w_mzscheme_ref = NULL;

  	MZ_GC_CHECK();

+ 	MZ_GC_UNREG();

      }

  }

***************

*** 1349,1355 ****

  }

      static void

! do_output(char *mesg, intptr_t len UNUSED)

  {

      /* TODO: use len, the string may not be NUL terminated */

      do_intrnl_output(mesg, 0);

--- 1417,1423 ----

  }

      static void

! do_output(char *mesg, OUTPUT_LEN_TYPE len UNUSED)

  {

      /* TODO: use len, the string may not be NUL terminated */

      do_intrnl_output(mesg, 0);

***************

*** 1371,1379 ****

  do_flush(void)

  {

      char *buff;

!     intptr_t length;

!     buff = scheme_get_sized_string_output(curerr, &length);

      MZ_GC_CHECK();

      if (length)

      {

--- 1439,1447 ----

  do_flush(void)

  {

      char *buff;

!     OUTPUT_LEN_TYPE length;

!     buff = scheme_get_sized_byte_string_output(curerr, &length);

      MZ_GC_CHECK();

      if (length)

      {

***************

*** 1381,1387 ****

  	return;

      }

!     buff = scheme_get_sized_string_output(curout, &length);

      MZ_GC_CHECK();

      if (length)

  	do_output(buff, length);

--- 1449,1455 ----

  	return;

      }

!     buff = scheme_get_sized_byte_string_output(curout, &length);

      MZ_GC_CHECK();

      if (length)

  	do_output(buff, length);

***************

*** 1398,1409 ****

  vim_command(void *data, int argc, Scheme_Object **argv)

  {

      Vim_Prim	*prim = (Vim_Prim *)data;

!     char	*cmd = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));

      /* may be use do_cmdline_cmd? */

!     do_cmdline((char_u *)cmd, NULL, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);

      update_screen(VALID);

      raise_if_error();

      return scheme_void;

  }

--- 1466,1482 ----

  vim_command(void *data, int argc, Scheme_Object **argv)

  {

      Vim_Prim	*prim = (Vim_Prim *)data;

!     Scheme_Object *cmd = NULL;

!     MZ_GC_DECL_REG(1);

!     MZ_GC_VAR_IN_REG(0, cmd);

!     MZ_GC_REG();

!     cmd = GUARANTEED_STRING_ARG(prim->name, 0);

      /* may be use do_cmdline_cmd? */

!     do_cmdline(BYTE_STRING_VALUE(cmd), NULL, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);

      update_screen(VALID);

+     MZ_GC_UNREG();

      raise_if_error();

      return scheme_void;

  }

***************

*** 1414,1439 ****

  {

  #ifdef FEAT_EVAL

      Vim_Prim		*prim = (Vim_Prim *)data;

!     char		*expr;

!     Scheme_Object	*result;

!     /* hash table to store visited values to avoid infinite loops */

!     Scheme_Hash_Table	*visited = NULL;

      typval_T		*vim_result;

! 

!     MZ_GC_DECL_REG(1);

!     MZ_GC_VAR_IN_REG(0, visited);

      MZ_GC_REG();

!     visited = scheme_make_hash_table(SCHEME_hash_ptr);

!     MZ_GC_CHECK();

! 

!     expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));

!     vim_result = eval_expr((char_u *)expr, NULL);

      if (vim_result == NULL)

  	raise_vim_exn(_("invalid expression"));

!     result = vim_to_mzscheme(vim_result, 1, visited);

      free_tv(vim_result);

      MZ_GC_UNREG();

--- 1487,1508 ----

  {

  #ifdef FEAT_EVAL

      Vim_Prim		*prim = (Vim_Prim *)data;

!     Scheme_Object	*result = NULL;

      typval_T		*vim_result;

!     Scheme_Object *expr = NULL;

!     MZ_GC_DECL_REG(2);

!     MZ_GC_VAR_IN_REG(0, result);

!     MZ_GC_VAR_IN_REG(1, expr);

      MZ_GC_REG();

+     expr = GUARANTEED_STRING_ARG(prim->name, 0);

!     vim_result = eval_expr(BYTE_STRING_VALUE(expr), NULL);

      if (vim_result == NULL)

  	raise_vim_exn(_("invalid expression"));

!     result = vim_to_mzscheme(vim_result);

!     MZ_GC_CHECK();

      free_tv(vim_result);

      MZ_GC_UNREG();

***************

*** 1474,1489 ****

  get_option(void *data, int argc, Scheme_Object **argv)

  {

      Vim_Prim	    *prim = (Vim_Prim *)data;

-     char_u	    *name;

      long	    value;

      char	    *strval;

      int		    rc;

!     Scheme_Object   *rval;

      int		    opt_flags = 0;

      buf_T	    *save_curb = curbuf;

      win_T	    *save_curw = curwin;

!     name = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));

      if (argc > 1)

      {

--- 1543,1563 ----

  get_option(void *data, int argc, Scheme_Object **argv)

  {

      Vim_Prim	    *prim = (Vim_Prim *)data;

      long	    value;

      char	    *strval;

      int		    rc;

!     Scheme_Object   *rval = NULL;

!     Scheme_Object   *name = NULL;

      int		    opt_flags = 0;

      buf_T	    *save_curb = curbuf;

      win_T	    *save_curw = curwin;

!     MZ_GC_DECL_REG(2);

!     MZ_GC_VAR_IN_REG(0, rval);

!     MZ_GC_VAR_IN_REG(1, name);

!     MZ_GC_REG();

! 

!     name = GUARANTEED_STRING_ARG(prim->name, 0);

      if (argc > 1)

      {

***************

*** 1513,1535 ****

  	    scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv);

      }

!     rc = get_option_value(name, &value, (char_u **)&strval, opt_flags);

      curbuf = save_curb;

      curwin = save_curw;