Merge branch 'master' into Gtk.

diff --cc dist/make-src-files
Simple merge

diff --cc dist/shared.sh
Simple merge

diff --cc doc/Makefile.in
Simple merge

diff --cc doc/configure.ac
Simple merge

diff --cc doc/make-common.in
Simple merge

diff --cc doc/ref-manual/graphics.texi
Simple merge

diff --cc doc/user-manual/user.texinfo
Simple merge

diff --cc src/Makefile.in
index e424ca73fed4820961c73d8644a22862dd82bcd7,174b060d61431251d28773b5a1bdb7409078770a..7c8c9d52d3f57d22ab6016668817a3c29013aa66
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -61,9 -61,9 +61,9 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  # **** END BOILERPLATE ****
  
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
 -LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml
 +LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) ffi sos ssp xml
  
- SUBDIRS = $(INSTALLED_SUBDIRS) 6001 rcs win32 xdoc
+ SUBDIRS = $(INSTALLED_SUBDIRS) 6001 win32 xdoc
  INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
  
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
@@@ -106,11 -113,16 +109,11 @@@ TOOL_TOOLCHAIN = $(HOST_SCHEME) --band 
    --eval '(begin $(TOOL_COMPILER_SETTINGS))'
  
  .PHONY: toolchain
- toolchain: tools/compiler.com
+ toolchain: $(TOOLCHAIN)/compiler.com
  
- tools/compiler.com:
+ ./tools/compiler.com:
        $(MAKE) -f Makefile.tools clean && $(MAKE) -f Makefile.tools allclean
  
 -# This target toolchain crud is a kludge until the whole system can be
 -# cross-compiled.  Currently only IMAIL can't be.
 -TARGET_COMPILER_SETTINGS = \
 -      $(COMPILER_SETTINGS_LIARC)
 -
  TARGET_RUNTIME = ./microcode/scheme \
        --library lib --band runtime.com --batch-mode
  TARGET_COMPILER = $(TARGET_RUNTIME) \

diff --cc src/README.txt
Simple merge

diff --cc src/Setup.sh
index 5e00cc841dde7f98b4a146315b135a91331ada7f,8ace433d10f64478342828189c736f47c7b87d91..187e86cbd6c2ce3c5d7330dc3cf26a5bacdc5d3c
--- 1/src/Setup.sh
--- 2/src/Setup.sh
+++ b/src/Setup.sh
@@@ -75,8 -75,8 +75,8 @@@ f
  
  . etc/functions.sh
  
 -INSTALLED_SUBDIRS="cref edwin ffi imail sf sos ssp star-parser xml"
 +INSTALLED_SUBDIRS="cref ffi sf sos ssp star-parser xml"
- OTHER_SUBDIRS="6001 compiler rcs runtime win32 xdoc microcode"
+ OTHER_SUBDIRS="6001 compiler runtime win32 xdoc microcode"
  
  # lib
  maybe_mkdir lib

diff --cc src/Tags.sh
Simple merge

diff --cc src/berkeley-db/berkeley-db.scm
Simple merge

diff --cc src/berkeley-db/prdb4.c
Simple merge

diff --cc src/berkeley-db/prdb4.scm
Simple merge

diff --cc src/blowfish/Makefile.am
Simple merge

diff --cc src/blowfish/NEWS
Simple merge

diff --cc src/blowfish/blowfish.pkg
Simple merge

diff --cc src/blowfish/configure.ac
Simple merge

diff --cc src/compiler/Stage.sh
Simple merge

diff --cc src/configure.ac
Simple merge

diff --cc src/edwin/buffrm.scm
Simple merge

diff --cc src/edwin/bufwfs.scm
Simple merge

diff --cc src/edwin/bufwin.scm
Simple merge

diff --cc src/edwin/bufwiu.scm
Simple merge

diff --cc src/edwin/decls.scm
Simple merge

diff --cc src/edwin/ed-ffi.scm
Simple merge

diff --cc src/edwin/editor.scm
Simple merge

diff --cc src/edwin/edtfrm.scm
Simple merge

diff --cc src/edwin/edwin.ldr
Simple merge

diff --cc src/edwin/edwin.pkg
Simple merge

diff --cc src/edwin/edwin.sf
Simple merge

diff --cc src/edwin/filcom.scm
Simple merge

diff --cc src/edwin/fileio.scm
Simple merge

diff --cc src/edwin/image.scm
Simple merge

diff --cc src/edwin/kilcom.scm
Simple merge

diff --cc src/edwin/make.scm
Simple merge

diff --cc src/edwin/modwin.scm
Simple merge

diff --cc src/edwin/nntp.scm
Simple merge

diff --cc src/edwin/screen.scm
Simple merge

diff --cc src/edwin/tterm.scm
Simple merge

diff --cc src/edwin/utlwin.scm
Simple merge

diff --cc src/edwin/window.scm
Simple merge

diff --cc src/etc/build-bands.sh
Simple merge

diff --cc src/etc/compile-boot-compiler.sh
Simple merge

diff --cc src/etc/compile.scm
Simple merge

diff --cc src/etc/create-makefiles.sh
Simple merge

diff --cc src/etc/optiondb.scm
Simple merge

diff --cc src/etc/utilities.scm
Simple merge

diff --cc src/gdbm/Makefile.am
Simple merge

diff --cc src/gdbm/NEWS
Simple merge

diff --cc src/gdbm/configure.ac
Simple merge

diff --cc src/gdbm/gdbm.pkg
Simple merge

diff --cc src/imail/compile.scm
Simple merge

diff --cc src/imail/imail-mime.scm
Simple merge

diff --cc src/imail/imail.pkg
Simple merge

diff --cc src/imail/mit-scheme-pucked-imail.texi
Simple merge

diff --cc src/mcrypt/Makefile.am
Simple merge

diff --cc src/mcrypt/NEWS
Simple merge

diff --cc src/mcrypt/configure.ac
Simple merge

diff --cc src/mcrypt/mcrypt.pkg
Simple merge

diff --cc src/md5/Makefile.am
Simple merge

diff --cc src/md5/NEWS
Simple merge

diff --cc src/md5/configure.ac
Simple merge

diff --cc src/md5/md5.pkg
Simple merge

diff --cc src/mhash/Makefile.am
Simple merge

diff --cc src/mhash/NEWS
Simple merge

diff --cc src/mhash/configure.ac
Simple merge

diff --cc src/mhash/mhash.pkg
Simple merge

diff --cc src/microcode/configure.ac
index 09806080cc9861203455c3c882a7f02f882e046a,e30134b52b17645922703347063b7ce7c5bce996..69fed617f9833c6b4cd4a091b06c3abc54cd880b
--- 1/src/microcode/configure.ac
--- 2/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@@ -240,12 -276,8 +240,8 @@@ CCLD=${CC
  
  MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
  
- if test x${mit_scheme_native_code} = xhppa; then
-    GC_HEAD_FILES="${GC_HEAD_FILES} hppacach.h"
- fi
- 
 -AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
 -EXE_NAME=mit-scheme-${mit_scheme_native_code}
 +AUXDIR_NAME=mit-scheme-pucked
 +EXE_NAME=mit-scheme-pucked
  
  dnl Add OS-dependent customizations.  This must happen before checking
  dnl any headers or library routines, because it may add CFLAGS or

diff --cc src/microcode/liarc-ld.in
Simple merge

diff --cc src/microcode/makegen/Makefile.in.in
Simple merge

diff --cc src/microcode/makegen/files-optional.scm
Simple merge

diff --cc src/microcode/mit_scheme_native_code.m4
Simple merge

diff --cc src/microcode/ntutl/makefile
Simple merge

diff --cc src/microcode/ntutl/makefile.wcc
Simple merge

diff --cc src/pgsql/pgsql.c
Simple merge

diff --cc src/pgsql/pgsql.scm
Simple merge

diff --cc src/runtime/blowfish.scm
Simple merge

diff --cc src/runtime/crypto.scm
Simple merge

diff --cc src/runtime/ed-ffi.scm
Simple merge

diff --cc src/runtime/ffi.scm
Simple merge

diff --cc src/runtime/krypt.scm
Simple merge

diff --cc src/runtime/load.scm
Simple merge

diff --cc src/runtime/make.scm
Simple merge

diff --cc src/runtime/runtime.pkg
Simple merge

diff --cc src/runtime/version.scm
Simple merge

diff --cc src/x11-screen/Makefile.am
Simple merge

diff --cc src/x11-screen/compile.sh
Simple merge

diff --cc src/x11-screen/configure.ac
Simple merge

diff --cc src/x11-screen/ed-ffi.scm
Simple merge

diff --cc src/x11-screen/x11-screen.pkg
Simple merge

diff --cc src/x11/Makefile.am
Simple merge

diff --cc src/x11/configure.ac
Simple merge

diff --cc src/x11/x11.pkg
Simple merge

diff --cc tests/check.scm
Simple merge

diff --cc tests/ffi/test-ffi.scm
Simple merge

diff --cc tests/runtime/test-mime-codec.scm
Simple merge

diff --cc tests/runtime/test-process.scm
Simple merge