7.3.049

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.049
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.049
  11 Problem:    PLT has rebranded their Scheme to Racket.
  12 Solution:   Add support for Racket 5.x. (Sergey Khorev)
  13 Files:      src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak,
  14             src/auto/configure, src/configure.in, src/if_mzsch.c
  15
  16
  17 *** ../vim-7.3.048/src/Make_cyg.mak     2010-08-15 21:57:27.000000000 +0200
  18 --- src/Make_cyg.mak    2010-11-03 21:50:42.000000000 +0100
  19 ***************
  20 *** 1,6 ****
  21   #
  22   # Makefile for VIM on Win32, using Cygnus gcc
  23 ! # Last updated by Dan Sharp.  Last Change: 2010 Feb 24
  24   #
  25   # Also read INSTALLpc.txt!
  26   #
  27 --- 1,6 ----
  28   #
  29   # Makefile for VIM on Win32, using Cygnus gcc
  30 ! # Last updated by Dan Sharp.  Last Change: 2010 Nov 03
  31   #
  32   # Also read INSTALLpc.txt!
  33   #
  34 ***************
  35 *** 27,32 ****
  36 --- 27,33 ----
  37   #   MZSCHEME_VER      define to version of MzScheme being used (209_000)
  38   #   DYNAMIC_MZSCHEME  no or yes: use yes to load the MzScheme DLLs dynamically (yes)
  39   #   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.
  40 + #   MZSCHEME_USE_RACKET  define to use "racket" instead of "mzsch".
  41   # LUA define to path to Lua dir to get Lua support (not defined)
  42   #   LUA_VER       define to version of Lua being used (51)
  43   #   DYNAMIC_LUA  no or yes: use yes to load the Lua DLL dynamically (yes)
  44 ***************
  45 *** 254,269 ****
  46   MZSCHEME_GENERATE_BASE=no
  47   endif
  48
  49   ifeq (yes, $(DYNAMIC_MZSCHEME))
  50 ! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  51   else
  52   ifndef MZSCHEME_DLLS
  53   MZSCHEME_DLLS = $(MZSCHEME)
  54   endif
  55   ifeq (yes,$(MZSCHEME_PRECISE_GC))
  56 ! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
  57   else
  58 ! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  59   endif
  60   EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
  61   endif
  62 --- 255,276 ----
  63   MZSCHEME_GENERATE_BASE=no
  64   endif
  65
  66 + ifndef MZSCHEME_USE_RACKET
  67 + MZSCHEME_MAIN_LIB=mzsch
  68 + else
  69 + MZSCHEME_MAIN_LIB=racket
  70 + endif
  71 +
  72   ifeq (yes, $(DYNAMIC_MZSCHEME))
  73 ! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  74   else
  75   ifndef MZSCHEME_DLLS
  76   MZSCHEME_DLLS = $(MZSCHEME)
  77   endif
  78   ifeq (yes,$(MZSCHEME_PRECISE_GC))
  79 ! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
  80   else
  81 ! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  82   endif
  83   EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
  84   endif
  85 *** ../vim-7.3.048/src/Make_ming.mak    2010-09-29 18:42:25.000000000 +0200
  86 --- src/Make_ming.mak   2010-11-03 21:48:14.000000000 +0100
  87 ***************
  88 *** 141,151 ****
  89   MZSCHEME_GENERATE_BASE=no
  90   endif
  91
  92   ifeq (no,$(DYNAMIC_MZSCHEME))
  93   ifeq (yes,$(MZSCHEME_PRECISE_GC))
  94 ! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
  95   else
  96 ! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  97   endif
  98   # the modern MinGW can dynamically link to dlls directly.
  99   # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
 100 --- 141,157 ----
 101   MZSCHEME_GENERATE_BASE=no
 102   endif
 103
 104 + ifndef MZSCHEME_USE_RACKET
 105 + MZSCHEME_MAIN_LIB=mzsch
 106 + else
 107 + MZSCHEME_MAIN_LIB=racket
 108 + endif
 109 +
 110   ifeq (no,$(DYNAMIC_MZSCHEME))
 111   ifeq (yes,$(MZSCHEME_PRECISE_GC))
 112 ! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
 113   else
 114 ! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
 115   endif
 116   # the modern MinGW can dynamically link to dlls directly.
 117   # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
 118 ***************
 119 *** 343,349 ****
 120   ifdef MZSCHEME
 121   CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
 122   ifeq (yes, $(DYNAMIC_MZSCHEME))
 123 ! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 124   endif
 125   endif
 126
 127 --- 349,355 ----
 128   ifdef MZSCHEME
 129   CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
 130   ifeq (yes, $(DYNAMIC_MZSCHEME))
 131 ! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 132   endif
 133   endif
 134
 135 *** ../vim-7.3.048/src/Make_mvc.mak     2010-08-15 21:57:27.000000000 +0200
 136 --- src/Make_mvc.mak    2010-11-03 21:48:14.000000000 +0100
 137 ***************
 138 *** 705,716 ****
 139   MZSCHEME_VER = 205_000
 140   !endif
 141   CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
 142 ! !if EXIST("$(MZSCHEME)\collects\scheme\base.ss")
 143 ! # for MzScheme 4.x we need to include byte code for basic Scheme stuff
 144   MZSCHEME_EXTRA_DEP = mzscheme_base.c
 145   CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
 146   !endif
 147 ! !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") \
 148         && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
 149   !message Building with Precise GC
 150   MZSCHEME_PRECISE_GC = yes
 151 --- 705,722 ----
 152   MZSCHEME_VER = 205_000
 153   !endif
 154   CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
 155 ! !if EXIST("$(MZSCHEME)\collects\scheme\base.ss") \
 156 !       || EXIST("$(MZSCHEME)\collects\scheme\base.rkt")
 157 ! # for MzScheme >= 4 we need to include byte code for basic Scheme stuff
 158   MZSCHEME_EXTRA_DEP = mzscheme_base.c
 159   CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
 160   !endif
 161 ! !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib")
 162 ! MZSCHEME_MAIN_LIB=mzsch
 163 ! !else
 164 ! MZSCHEME_MAIN_LIB=racket
 165 ! !endif
 166 ! !if EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \
 167         && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
 168   !message Building with Precise GC
 169   MZSCHEME_PRECISE_GC = yes
 170 ***************
 171 *** 722,728 ****
 172   !endif
 173   !message MzScheme DLLs will be loaded dynamically
 174   CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
 175 !               -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \
 176                 -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 177   !else
 178   !if "$(MZSCHEME_DEBUG)" == "yes"
 179 --- 728,734 ----
 180   !endif
 181   !message MzScheme DLLs will be loaded dynamically
 182   CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
 183 !               -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
 184                 -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 185   !else
 186   !if "$(MZSCHEME_DEBUG)" == "yes"
 187 ***************
 188 *** 730,739 ****
 189   !endif
 190   !if "$(MZSCHEME_PRECISE_GC)" == "yes"
 191   # Precise GC does not use separate dll
 192 ! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
 193   !else
 194   MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
 195 !               $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
 196   !endif
 197   !endif
 198   MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
 199 --- 736,745 ----
 200   !endif
 201   !if "$(MZSCHEME_PRECISE_GC)" == "yes"
 202   # Precise GC does not use separate dll
 203 ! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
 204   !else
 205   MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
 206 !               $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
 207   !endif
 208   !endif
 209   MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
 210 *** ../vim-7.3.048/src/auto/configure   2010-10-27 16:49:41.000000000 +0200
 211 --- src/auto/configure  2010-11-03 21:53:09.000000000 +0100
 212 ***************
 213 *** 4862,4877 ****
 214         else
 215         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 216   $as_echo "no" >&6; }
 217 !       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
 218 ! $as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
 219 !       if test -f /usr/include/plt/scheme.h; then
 220           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 221   $as_echo "yes" >&6; }
 222 !         SCHEME_INC=/usr/include/plt
 223         else
 224           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 225   $as_echo "no" >&6; }
 226 !         vi_cv_path_mzscheme_pfx=
 227         fi
 228         fi
 229       fi
 230 --- 4862,4897 ----
 231         else
 232         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 233   $as_echo "no" >&6; }
 234 !       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
 235 ! $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
 236 !       if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
 237           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 238   $as_echo "yes" >&6; }
 239 !         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
 240         else
 241           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 242   $as_echo "no" >&6; }
 243 !         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
 244 ! $as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
 245 !         if test -f /usr/include/plt/scheme.h; then
 246 !           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 247 ! $as_echo "yes" >&6; }
 248 !           SCHEME_INC=/usr/include/plt
 249 !         else
 250 !           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 251 ! $as_echo "no" >&6; }
 252 !           { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5
 253 ! $as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; }
 254 !           if test -f /usr/include/racket/scheme.h; then
 255 !             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 256 ! $as_echo "yes" >&6; }
 257 !             SCHEME_INC=/usr/include/racket
 258 !           else
 259 !             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 260 ! $as_echo "no" >&6; }
 261 !             vi_cv_path_mzscheme_pfx=
 262 !           fi
 263 !         fi
 264         fi
 265         fi
 266       fi
 267 ***************
 268 *** 4883,4894 ****
 269       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
 270         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
 271         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 272 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
 273         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 274       else
 275               if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
 276           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
 277         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 278         else
 279           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
 280         fi
 281 --- 4903,4924 ----
 282       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
 283         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
 284         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 285 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
 286 !       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
 287 !       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 288 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
 289 !       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 290 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
 291         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 292       else
 293               if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
 294           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
 295         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 296 +       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
 297 +         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
 298 +       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 299 +       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
 300 +         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
 301         else
 302           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
 303         fi
 304 ***************
 305 *** 4901,4910 ****
 306       fi
 307       if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
 308         SCHEME_COLLECTS=lib/plt/
 309       fi
 310       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
 311 !             MZSCHEME_EXTRA="mzscheme_base.c"
 312 !       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
 313         MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
 314       fi
 315       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
 316 --- 4931,4950 ----
 317       fi
 318       if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
 319         SCHEME_COLLECTS=lib/plt/
 320 +     else
 321 +       if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
 322 +       SCHEME_COLLECTS=lib/racket/
 323 +       fi
 324       fi
 325       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
 326 !       MZSCHEME_EXTRA="mzscheme_base.c"
 327 !     else
 328 !       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
 329 !       MZSCHEME_EXTRA="mzscheme_base.c"
 330 !       fi
 331 !     fi
 332 !     if test "X$MZSCHEME_EXTRA" != "X" ; then
 333 !             MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
 334         MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
 335       fi
 336       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
 337 *** ../vim-7.3.048/src/configure.in     2010-10-27 16:49:41.000000000 +0200
 338 --- src/configure.in    2010-11-03 21:48:14.000000000 +0100
 339 ***************
 340 *** 568,580 ****
 341         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
 342         else
 343         AC_MSG_RESULT(no)
 344 !       AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
 345 !       if test -f /usr/include/plt/scheme.h; then
 346           AC_MSG_RESULT(yes)
 347 !         SCHEME_INC=/usr/include/plt
 348         else
 349           AC_MSG_RESULT(no)
 350 !         vi_cv_path_mzscheme_pfx=
 351         fi
 352         fi
 353       fi
 354 --- 568,594 ----
 355         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
 356         else
 357         AC_MSG_RESULT(no)
 358 !       AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
 359 !       if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
 360           AC_MSG_RESULT(yes)
 361 !         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
 362         else
 363           AC_MSG_RESULT(no)
 364 !         AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
 365 !         if test -f /usr/include/plt/scheme.h; then
 366 !           AC_MSG_RESULT(yes)
 367 !           SCHEME_INC=/usr/include/plt
 368 !         else
 369 !           AC_MSG_RESULT(no)
 370 !           AC_MSG_CHECKING(if scheme.h can be found in /usr/include/racket/)
 371 !           if test -f /usr/include/racket/scheme.h; then
 372 !             AC_MSG_RESULT(yes)
 373 !             SCHEME_INC=/usr/include/racket
 374 !           else
 375 !             AC_MSG_RESULT(no)
 376 !             vi_cv_path_mzscheme_pfx=
 377 !           fi
 378 !         fi
 379         fi
 380         fi
 381       fi
 382 ***************
 383 *** 586,598 ****
 384       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
 385         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
 386         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 387 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
 388         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 389       else
 390         dnl Using shared objects
 391         if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
 392           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
 393         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 394         else
 395           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
 396         fi
 397 --- 600,622 ----
 398       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
 399         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
 400         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 401 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
 402 !       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
 403 !       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 404 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
 405 !       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 406 !     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
 407         MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
 408       else
 409         dnl Using shared objects
 410         if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
 411           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
 412         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 413 +       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
 414 +         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
 415 +       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
 416 +       elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
 417 +         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
 418         else
 419           MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
 420         fi
 421 ***************
 422 *** 607,616 ****
 423       fi
 424       if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
 425         SCHEME_COLLECTS=lib/plt/
 426       fi
 427       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
 428 -       dnl need to generate bytecode for MzScheme base
 429         MZSCHEME_EXTRA="mzscheme_base.c"
 430         MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
 431         MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
 432       fi
 433 --- 631,650 ----
 434       fi
 435       if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
 436         SCHEME_COLLECTS=lib/plt/
 437 +     else
 438 +       if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
 439 +       SCHEME_COLLECTS=lib/racket/
 440 +       fi
 441       fi
 442       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
 443         MZSCHEME_EXTRA="mzscheme_base.c"
 444 +     else
 445 +       if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
 446 +       MZSCHEME_EXTRA="mzscheme_base.c"
 447 +       fi
 448 +     fi
 449 +     if test "X$MZSCHEME_EXTRA" != "X" ; then
 450 +       dnl need to generate bytecode for MzScheme base
 451         MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
 452         MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
 453       fi
 454 *** ../vim-7.3.048/src/if_mzsch.c       2010-10-23 14:02:48.000000000 +0200
 455 --- src/if_mzsch.c      2010-11-03 21:48:14.000000000 +0100
 456 ***************
 457 *** 794,802 ****
 458 --- 794,809 ----
 459   #endif
 460   }
 461
 462 + #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
 463 + static __declspec(thread) void *tls_space;
 464 + #endif
 465 +
 466       void
 467   mzscheme_main(void)
 468   {
 469 + #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
 470 +     scheme_register_tls_space(&tls_space, 0);
 471 + #endif
 472   #if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR >= 400
 473       /* use trampoline for precise GC in MzScheme >= 4.x */
 474       scheme_main_setup(TRUE, mzscheme_env_main, 0, NULL);
 475 *** ../vim-7.3.048/src/version.c        2010-11-03 19:32:36.000000000 +0100
 476 --- src/version.c       2010-11-03 21:57:04.000000000 +0100
 477 ***************
 478 *** 716,717 ****
 479 --- 716,719 ----
 480   {   /* Add new patch number below this line */
 481 + /**/
 482 +     49,
 483   /**/
 484
 485 --
 486 TIM: But follow only if you are men of valour.  For the entrance to this cave
 487      is guarded by a monster, a creature so foul and cruel that no man yet has
 488      fought with it and lived.  Bones of full fifty men lie strewn about its
 489      lair ...
 490                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
 491
 492  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 493 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 494 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 495  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///