Merge branch 'master' into Gtk.

diff --cc src/Makefile.in
index 4440da6bc64d5d213dffcaaf1a5b91857b398390,9a5a41dcf622fcb9c92a0d44ded9e7a726e1bb37..e424ca73fed4820961c73d8644a22862dd82bcd7
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -663,28 -747,82 +678,8 @@@ cross-end: cross-hos
        | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \
            --fasl make.bin)
  
 -### Stuff that depends on running the code we just compiled, because it
 -### uses Edwin macros.  This is a kludge until we can fix macro phasing
 -### and persuade the cross-compiler to load and run macros for the
 -### target.
 -
 -# IMAIL
 -
 -.PHONY: all-imail
 -all-imail: compile-imail
 -@IF_LIARC@all-imail: bundle-imail
 -
 -.PHONY: bundle-imail
 -bundle-imail: liarc-bundle-tools
 -bundle-imail: compile-imail
 -bundle-imail: imail/imail-unx.c
 -bundle-imail: imail/imail-w32.c
 -      (cd imail && $(MAKE) compile-liarc-bundle)
 -
 -# Must write these rules explicitly because we use TARGET_COMPILER, not
 -# TOOL_COMPILER.
 -#
 -# XXX These depend on imail/imail-unx.pkd intentionally because make
 -# has no good way to express a rule that generates multiple files at
 -# once.
 -imail/imail-unx.c: imail/imail-unx.pkd
 -      echo '(cbf "imail/imail-unx.pkd")' | $(TARGET_COMPILER)
 -imail/imail-w32.c: imail/imail-unx.pkd
 -      echo '(cbf "imail/imail-w32.pkd")' | $(TARGET_COMPILER)
 -
 -# XXX We enter lib/imail/ rather than imail/ so that liarc library
 -# directory pathnames get resolved to builtin objects.  This is a
 -# kludge.
 -
 -.PHONY: compile-imail
 -compile-imail: target-toolchain
 -compile-imail: compile-edwin
 -compile-imail: compile-runtime
 -compile-imail: compile-sos
 -compile-imail: compile-star-parser
 -compile-imail: cref-imail
 -      (echo '(begin' && \
 -       echo '  (load-option (quote *PARSER))' && \
 -       echo '  (load-option (quote EDWIN))' && \
 -       echo '  (load-option (quote SOS))' && \
 -       echo '  (with-working-directory-pathname "lib/imail"' && \
 -       echo '    (lambda ()' && \
 -       echo '      (load "compile"))))') \
 -      | $(TARGET_TOOLCHAIN)
 -
 -.PHONY: cref-imail
 -cref-imail: imail/imail-unx.pkd
 -
 -@IF_LIARC@IMAIL_CREF_PRELOAD = \
 -@IF_LIARC@    echo '(load-option (quote SOS))' && \
 -@IF_LIARC@    echo '(load-option (quote EDWIN))' && \
 -@IF_LIARC@    echo '(load-option (quote *PARSER))' &&
 -
 -imail/imail-unx.pkd: target-toolchain
 -imail/imail-unx.pkd: cref-edwin
 -imail/imail-unx.pkd: cref-runtime
 -imail/imail-unx.pkd: cref-sos
 -imail/imail-unx.pkd: cref-star-parser
 -@IF_LIARC@imail/imail-unx.pkd: all-edwin
 -@IF_LIARC@imail/imail-unx.pkd: all-runtime
 -@IF_LIARC@imail/imail-unx.pkd: all-sos
 -@IF_LIARC@imail/imail-unx.pkd: all-star-parser
 -imail/imail-unx.pkd: imail/imail.pkg
 -      (echo '(begin' && \
 -       $(IMAIL_CREF_PRELOAD) \
 -       echo '  (with-working-directory-pathname "lib/imail"' && \
 -       echo '    (lambda ()' && \
 -       echo '      (cref/generate-trivial-constructor "imail"))))') \
 -      | $(TARGET_SYNTAXER)
 -
  # **** Legacy serialized targets ****
  
- all-svm: microcode/svm1-defns.h
-       $(MAKE) compile-microcode
-       @$(top_srcdir)/etc/compile-svm.sh "$(MIT_SCHEME_EXE)"
-       $(MAKE) build-bands
- 
- microcode/svm1-defns.h: compiler/machines/svm/svm1-defns.h
-       @$(top_srcdir)/etc/maybe-update-file.sh \
-         compiler/machines/svm/svm1-defns.h \
-         microcode/svm1-defns.h
- 
- compiler/machines/svm/svm1-defns.h: \
-         compiler/machines/svm/assembler-rules.scm \
-         compiler/machines/svm/machine.scm \
-         compiler/machines/svm/assembler-compiler.scm \
-         compiler/machines/svm/assembler-runtime.scm \
-         compiler/machines/svm/compile-assembler.scm
-       ( cd compiler/machines/svm/ \
-         && "$(MIT_SCHEME_EXE)" --batch-mode --load compile-assembler \
-               </dev/null )
- 
  all-liarc:
        @$(top_srcdir)/etc/c-compile.sh "$(MIT_SCHEME_EXE)" --batch-mode
        $(MAKE) compile-liarc-bundles build-bands

diff --cc src/blowfish/Makefile.am
index ef6f68339619e4ade43a5029477be3522f7e5ced,0cd08544c42d91f57aa31fa0a32207d40b485422..fff568fa0d6c37780836119fed3b8c66e5a1739e
--- 1/src/blowfish/Makefile.am
--- 2/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@@ -44,7 -45,9 +45,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
++dvidir = $(libdir)/mit-scheme-pucked/doc
++pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
@@@ -107,11 -107,10 +108,11 @@@ install-data-hook
  #     | $(MIT_SCHEME_EXE) --batch-mode
  
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
-       [ -d "$(DESTDIR)$(scmlib_blowfishdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_blowfishdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
  #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
  #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
  #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/configure.ac
Simple merge

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

diff --cc src/gdbm/Makefile.am
index 81d0b1dfd9ab1fb7dbf8ec48250a728b6fc9630e,0ca01bc1eb5c9f3d0bc5082c23372c0cfa510af7..91969d7e19e09e9d1ea4a83d34ad4481c90694f4
--- 1/src/gdbm/Makefile.am
--- 2/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@@ -44,7 -45,9 +45,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
++dvidir = $(libdir)/mit-scheme-pucked/doc
++pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
@@@ -93,25 -94,23 +94,25 @@@ all_sources = $(sources) gdbm-adapter.
  ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
  TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
  
- EXTRA_DIST += $(all_sources) $(cdecls) gdbm.pkg
- EXTRA_DIST += compile.scm gdbm-check.scm gdbm-check.sh
+ EXTRA_DIST += $(all_sources) $(cdecls) compile.scm gdbm.pkg
+ EXTRA_DIST += gdbm-check.scm gdbm-check.sh
 -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
  
  #install-html: install-html-am
  #     echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \
  #     | $(MIT_SCHEME_EXE) --batch-mode
  
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
-       [ -d "$(DESTDIR)$(scmlib_gdbmdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_gdbmdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
  #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
  #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
  #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/mcrypt/Makefile.am
index 54bffe226776a654f90d0ec3322927811e6a9af9,f28a329a793b0eb8a741cf525e61d250e819494b..e986041fc643e523adc35d977deb27c57d011b42
--- 1/src/mcrypt/Makefile.am
--- 2/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@@ -44,7 -45,9 +45,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
++dvidir = $(libdir)/mit-scheme-pucked/doc
++pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
@@@ -107,11 -107,10 +108,11 @@@ install-data-hook
  #     | $(MIT_SCHEME_EXE) --batch-mode
  
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
-       [ -d "$(DESTDIR)$(scmlib_mcryptdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_mcryptdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
  #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
  #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
  #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/md5/Makefile.am
index 1b126a9d086b54ed69ba2e581612cef43af42fbe,40264b7fb169b5c010fab62d3730e5d1926dc246..d6152ac6f7bf40819c278f9b7210bc3034d2639f
--- 1/src/md5/Makefile.am
--- 2/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@@ -44,7 -45,9 +45,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
++dvidir = $(libdir)/mit-scheme-pucked/doc
++pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
@@@ -107,11 -107,10 +108,11 @@@ install-data-hook
  #     | $(MIT_SCHEME_EXE) --batch-mode
  
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
-       [ -d "$(DESTDIR)$(scmlib_md5dir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_md5dir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
  #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
  #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
  #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/mhash/Makefile.am
index a089e5a4507a0e141b8c56bef9b271a027b10264,d9637dc6d11c5bf33e50b4cd770ac669de1106f0..427a5f7a3abaffe304ab95e6d1525cd678e01c7f
--- 1/src/mhash/Makefile.am
--- 2/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@@ -44,7 -45,9 +45,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
++dvidir = $(libdir)/mit-scheme-pucked/doc
++pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
@@@ -107,11 -107,10 +108,11 @@@ install-data-hook
  #     | $(MIT_SCHEME_EXE) --batch-mode
  
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
-       [ -d "$(DESTDIR)$(scmlib_mhashdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_mhashdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
  #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
  #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
  #          | $(MIT_SCHEME_EXE) --batch-mode )

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

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

diff --cc src/x11-screen/Makefile.am
index 5c7d83edfdb111de439c65b86175bd43f6eb7a50,d6df77f826527530c2e3710f6c0c22d625575fe4..0acaa0d39a3ff9708778d403affc1c1b64252dc3
--- 1/src/x11-screen/Makefile.am
--- 2/src/x11-screen/Makefile.am
+++ b/src/x11-screen/Makefile.am
@@@ -39,17 -40,11 +40,11 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
- x11-key.bci: stamp-scheme
- x11-key.com: stamp-scheme
- x11-command.bci: stamp-scheme
- x11-command.com: stamp-scheme
- x11-screen.bci: stamp-scheme
- x11-screen.com: stamp-scheme
- x11-screen-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+ @MIT_SCHEME_DEPS@
  stamp-scheme: $(sources) x11-screen.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
@@@ -64,16 -60,21 +60,23 @@@ TAGS_DEPENDENCIES = $(sources
  
  EXTRA_DIST += $(sources) compile.sh x11-screen.pkg
  EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm
 -EXTRA_DIST += make.scm optiondb.scm
 +EXTRA_DIST += make.scm optiondb.scm debian
  
  install-data-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
  
+ #install-html: install-html-am
+ #     echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \
+ #     | $(MIT_SCHEME_EXE) --batch-mode
+ 
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
        [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_subdir)"
+ #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+ #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+ #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/x11/Makefile.am
index 23c48e5db9edfd8d952717a2daa5a1e8b37240dd,d774c4265b832d04982dadc9e1986fab061adc09..815f7b9416d7e5a08a89b254567cb9a877754f39
--- 1/src/x11/Makefile.am
--- 2/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@@ -106,16 -96,21 +96,23 @@@ TAGS_DEPENDENCIES = $(all_sources) $(cd
  
  EXTRA_DIST += $(all_sources) $(cdecls) compile.sh x11.pkg
  EXTRA_DIST += x11-check.sh x11-test.scm
 -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
  
+ #install-html: install-html-am
+ #     echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \
+ #     | $(MIT_SCHEME_EXE) --batch-mode
+ 
  uninstall-hook:
 -      echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 -      | $(MIT_SCHEME_EXE) --batch-mode
 +      if [ -f "$(DESTDIR)$(scmlibdir)optiondb.scm" ]; then \
 +          echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 +          | $(MIT_SCHEME_EXE) --batch-mode; fi
        [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_subdir)"
+ #     [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+ #     && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+ #          | $(MIT_SCHEME_EXE) --batch-mode )

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

diff --cc src/x11/x11.pkg
index edbf9ddf9342deb73b9d20b532bf83a4669f1a53,65fc847cffb48680d38f2cf604811bf4a6fb7bd2..af73e28db26a1d9baa1689de3c01eff9bf1d58ac
--- 1/src/x11/x11.pkg
--- 2/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@@ -170,9 -170,9 +170,9 @@@ Inc., 51 Franklin St, Fifth Floor, Bost
          x-graphics-map-y-coordinate))
  
  (define-package (x11 device)
-   (files "x11device")
+   (files "x11-device")
    (parent (x11))
 -  (export (x11)
 +  (export ()
          create-x-colormap
          create-x-image
          x-character-bounds/ascent