Merge branch 'master' into pucked.

diff --cc src/Makefile.in
Simple merge

diff --cc src/configure.ac
Simple merge

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

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

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

diff --cc src/imail/compile.scm
index 12e9e04c42a0184b9c80083d566d3e68f495cf89,48dda2c035901b53a3c40c94e32e585ee7667535..ee999c225654698632db569f5bc96df5ebb57ddb
--- 1/src/imail/compile.scm
--- 2/src/imail/compile.scm
+++ b/src/imail/compile.scm
@@@ -26,22 -26,24 +26,22 @@@ USA
  
  ;;;; IMAIL mail reader: compilation
  
 -(load-option 'cref)
 -(load-option 'sos)
 -(load-option '*parser)
 -(load-option 'edwin)
 -(with-working-directory-pathname (directory-pathname (current-load-pathname))
 -  (lambda ()
 -    (for-each (lambda (filename)
 -              (compile-file filename '() (->environment '(edwin))))
 -            '("imail-browser"
 -              "imail-core"
 -              "imail-file"
 -              "imail-imap"
 -              "imail-mime"
 -              "imail-rmail"
 -              "imail-summary"
 -              "imail-top"
 -              "imail-umail"
 -              "imail-util"
 -              "imap-response"
 -              "imap-syntax"))
 -    (cref/generate-constructors "imail")))
 +(parameterize ((param:suppress-loading-message? #t))
 +  (for-each load-option '(cref sos *parser edwin)))
 +
 +(for-each (lambda (filename)
-               (compile-file filename '() (->environment '(edwin))))
++          (compile-file filename '() (->environment '(edwin))))
 +        '("imail-browser"
 +          "imail-core"
 +          "imail-file"
 +          "imail-imap"
 +          "imail-mime"
 +          "imail-rmail"
 +          "imail-summary"
 +          "imail-top"
 +          "imail-umail"
 +          "imail-util"
 +          "imap-response"
 +          "imap-syntax"))
 +
 +(cref/generate-constructors "imail")

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

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

diff --cc src/runtime/mit-macros.scm
Simple merge

diff --cc src/runtime/runtime.pkg
index 6173a6652cd439c5446996b2458a29f9efdedd5e,8820d7981ec8f218be9e8cdaf55538347ec27b6f..68efa01861ea8dfffb92db824ce3287a9c81fc8a
--- 1/src/runtime/runtime.pkg
--- 2/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@@ -631,8 -631,6 +631,7 @@@ USA
          set-ephemeron-key!
          set-interrupt-enables!
          show-time
-         simple-top-level-environment
 +        spawn-edwin
          system-hunk3-cons
          system-hunk3-cxr0
          system-hunk3-cxr1

diff --cc src/x11/compile.scm
index 53802e83642adaa19f61f54e03b4fa65955fcefa,59d96dcd24723d506956149ecba8ebe23739f5ea..7c7b1d8b392fdac1284e085750a4f7c55fe4bc58
--- 1/src/x11/compile.scm
--- 2/src/x11/compile.scm
+++ b/src/x11/compile.scm
@@@ -24,17 -24,16 +24,15 @@@ USA
  
  |#
  
- 
 -(load-option 'cref)
 -(load-option 'ffi)
 -(with-working-directory-pathname (directory-pathname (current-load-pathname))
 -  (lambda ()
 -    (for-each (let ((env (->environment '(runtime))))
 -              (lambda (filename)
 -                (compile-file filename '() env)))
 -            '("x11-base"
 -              "x11-color"
 -              "x11-graphics"
 -              "x11-device"
 -              "x11-terminal"))
 -    (cref/generate-constructors "x11")))
 +(for-each load-option '(cref ffi))
 +
 +(for-each (let ((env (->environment '(runtime))))
 +          (lambda (filename)
 +            (compile-file filename '() env)))
-         '("x11"
-           "x11-base"
++        '("x11-base"
 +          "x11-color"
 +          "x11-graphics"
 +          "x11-device"
 +          "x11-terminal"))
 +
 +(cref/generate-constructors "x11")

diff --cc src/x11/configure.ac
index c3a6f6dfc9a17c5b4af6cdbfc7027edfcec9900b,d7070ad56eaf97e5cb0354275dc215908b9bdb43..4e1a659d4c047ad8483960c5dc8284aeae18e99b
--- 1/src/x11/configure.ac
--- 2/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  dnl Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.69])
 -AC_INIT([MIT/GNU Scheme x11 plugin],
 -        [1.3],
 -        [bug-mit-scheme@gnu.org],
 -        [mit-scheme-x11])
 +AC_INIT([MIT/GNU Scheme Pucked x11 plugin],
-         [1.2.2],
++        [1.3.1],
 +        [matt@birchwood-abbey.net],
 +        [mit-scheme-pucked-x11])
  AC_CONFIG_SRCDIR([x11.pkg])
  AC_CONFIG_MACRO_DIR([m4])
  

diff --cc src/x11/make.scm
index fbd02e2e9ed92534faea05692187fb2f3bfe1ac2,5b4cf9c3651f1775d2e91a7b4824d73b4d929248..c8b6ce2788ab4efc5f6a29675f18e31211382ea6
--- 1/src/x11/make.scm
--- 2/src/x11/make.scm
+++ b/src/x11/make.scm
@@@ -5,4 -5,6 +5,6 @@@ Load the X11 option. |
  (with-loader-base-uri (system-library-uri "x11/")
    (lambda ()
      (load-package-set "x11")))
- (add-subsystem-identification! "X11" '(1 2 2))
 -(add-subsystem-identification! "X11" '(1 3))
++(add-subsystem-identification! "X11" '(1 3 1))
+ 
+ ((access link! (->environment '(runtime x-graphics))))

diff --cc src/x11/x11.pkg
index 1e40b35019ae91ae4dbd41997d81a59b6a157d93,63e5cbd2aaff74a3dadbb26b363802996886def0..8d6cd326b893a3902da0c5ea3f52924d392c6941
--- 1/src/x11/x11.pkg
--- 2/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@@ -25,13 -25,10 +25,10 @@@ Inc., 51 Franklin St, Fifth Floor, Bost
  
  ;;;; X11 Graphics Packaging
  \f
 -(global-definitions "../runtime/")
 +(global-definitions runtime/)
  
  (define-package (x11)
-   (files "x11")
-   (parent ())
-   (export ()
-         import-x11))
+   (parent ()))
  
  (define-package (x11 base)
    (files "x11-base")

diff --cc tests/check.scm
index 8f5a0dca7de47fa80cb802eafe8bf8c094dcda58,0e594288ce71dfeeddb824e224d0b5489764c2cf..c5ec1832322e026cf9ca99dc51ee826867709219
--- 1/tests/check.scm
--- 2/tests/check.scm
+++ b/tests/check.scm
@@@ -44,6 -44,7 +44,7 @@@ USA
      "compiler/test-fgopt-conect"
      "compiler/test-toplev"
      "compiler/test-varname"
 -    "compiler/test-vartrap"
++    ;;"compiler/test-vartrap"
      "compiler/test-y"
      "microcode/test-chacha"
      ;++ Kludge to run the flonum cast tests interpreted and compiled --