7.1.021

   1 To: vim-dev@vim.org
   2 Subject: patch 7.1.021
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.1.021 (after 7.1.015)
  11 Problem:    Mzscheme interface doesn't compile on Win32.
  12 Solution:   Fix the problem that 7.1.015 fixed in a better way. (Sergey Khorev)
  13 Files:      src/if_mzsch.c
  14
  15
  16 *** ../vim-7.1.020/src/if_mzsch.c       Thu Jun 28 13:02:22 2007
  17 --- src/if_mzsch.c      Sun Jul  1 18:44:49 2007
  18 ***************
  19 *** 308,313 ****
  20 --- 308,315 ----
  21   static Scheme_Config *(*dll_scheme_current_config)(void);
  22   static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
  23       (Scheme_Object *s);
  24 + static Scheme_Object *(*dll_scheme_char_string_to_path)
  25 +     (Scheme_Object *s);
  26   # endif
  27
  28   /* arrays are imported directly */
  29 ***************
  30 *** 398,403 ****
  31 --- 400,407 ----
  32   #  define scheme_current_config dll_scheme_current_config
  33   #  define scheme_char_string_to_byte_string \
  34       dll_scheme_char_string_to_byte_string
  35 + #  define scheme_char_string_to_path \
  36 +     dll_scheme_char_string_to_path
  37   # endif
  38
  39   typedef struct
  40 ***************
  41 *** 498,503 ****
  42 --- 502,509 ----
  43       {"scheme_current_config", (void **)&dll_scheme_current_config},
  44       {"scheme_char_string_to_byte_string",
  45         (void **)&dll_scheme_char_string_to_byte_string},
  46 +     {"scheme_char_string_to_path",
  47 +       (void **)&dll_scheme_char_string_to_path},
  48   # endif
  49       {NULL, NULL}};
  50
  51 ***************
  52 *** 773,779 ****
  53   #ifdef MZSCHEME_COLLECTS
  54       /* setup 'current-library-collection-paths' parameter */
  55       scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
  56 !           scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
  57   #endif
  58   #ifdef HAVE_SANDBOX
  59       /* setup sandbox guards */
  60 --- 779,793 ----
  61   #ifdef MZSCHEME_COLLECTS
  62       /* setup 'current-library-collection-paths' parameter */
  63       scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
  64 !           scheme_make_pair(
  65 ! # if MZSCHEME_VERSION_MAJOR >= 299
  66 !               scheme_char_string_to_path(
  67 !                   scheme_byte_string_to_char_string(
  68 !                       scheme_make_byte_string(MZSCHEME_COLLECTS))),
  69 ! # else
  70 !               scheme_make_string(MZSCHEME_COLLECTS),
  71 ! # endif
  72 !               scheme_null));
  73   #endif
  74   #ifdef HAVE_SANDBOX
  75       /* setup sandbox guards */
  76 *** ../vim-7.1.020/src/version.c        Thu Jul  5 10:10:29 2007
  77 --- src/version.c       Fri Jul  6 19:41:04 2007
  78 ***************
  79 *** 668,669 ****
  80 --- 668,671 ----
  81   {   /* Add new patch number below this line */
  82 + /**/
  83 +     21,
  84   /**/
  85
  86 --
  87 Advice to worms:  Sleep late.
  88
  89  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  90 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  91 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  92  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///