Merge branch 'master' into pucked.

diff --cc dist/shared.sh
index 159e550a695000c0c6d81ec6b5af15ab00499d95,881edc04aacb38282e04a95f9feaa4d079e2b7fe..0ed9d674e186ee8e00b610b06ac5c5cc5321ad30
--- 1/dist/shared.sh
--- 2/dist/shared.sh
+++ b/dist/shared.sh
@@@ -100,9 -100,7 +100,9 @@@ LIARC_OUT=${OUTPUT_DIR}/liar
  NATIVE_OUT=${OUTPUT_DIR}/native
  MACOSX_OUT=${OUTPUT_DIR}/macosx
  
- PLUGINS="blowfish edwin gdbm imail mcrypt x11 x11-screen"
+ PLUGINS="blowfish gdbm mcrypt edwin imail x11 x11-screen"
 +PLUGINS="$PLUGINS berkeley-db pgsql"
 +PLUGINS="$PLUGINS cairo gl glib gtk gtk-screen pango planetarium devops"
  
  notify ()
  {

diff --cc doc/ffi/ffi.texinfo
Simple merge

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

diff --cc src/configure.ac
Simple merge

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

diff --cc src/edwin/make.scm
index fd559b6ab1402391aa7913b2320145dd05e6985b,d1cdee9ff19cb23b1edca3fddc0008bafb11cd3b..adac79d188f53ea28b1f775a03c7da31dc60b848
--- 1/src/edwin/make.scm
--- 2/src/edwin/make.scm
+++ b/src/edwin/make.scm
@@@ -28,7 -28,9 +28,10 @@@ USA
  
  (declare (usual-integrations))
  
- (load-option 'SOS)
++(load-option 'sos)
+ (load-option 'xml)
+ (load-option 'blowfish)
+ (load-option 'gdbm)
  (with-loader-base-uri (system-library-uri "edwin/")
    (lambda ()
      (load-package-set "edwin"

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

diff --cc src/imail/make.scm
index 0e19a8aa7d3a2181d2ae0425d09efc5c9ffe528b,604b24a37f1432ef80df9bc862754de91d8c97ae..7190dc501cc2b443b774dbd19ed04ad51768e9c6
--- 1/src/imail/make.scm
--- 2/src/imail/make.scm
+++ b/src/imail/make.scm
@@@ -33,4 -33,4 +33,4 @@@ along with IMail; if not, write to the 
    (lambda ()
      (fluid-let ((*allow-package-redefinition?* #t))
        (load-package-set "imail"))))
- (add-subsystem-identification! "IMAIL" '(1 21 4))
 -(add-subsystem-identification! "IMAIL" '(1 22))
++(add-subsystem-identification! "IMAIL" '(1 22 1))

diff --cc src/runtime/global.scm
index 7412d9308fd3d3ebed87ed509015f894f872ac8a,873cac585d9771552bb0ae912ae793b880ccfe69..ef75663c9edccf6147e02a2b279c8028623c4675
--- 1/src/runtime/global.scm
--- 2/src/runtime/global.scm
+++ b/src/runtime/global.scm
@@@ -153,14 -153,12 +153,12 @@@ USA
          (with-notification
           (lambda (port) (display "Loading Edwin" port))
           (lambda ()
-            (parameterize*
-             (list (cons param:suppress-loading-message? #t))
-             (lambda ()
-               (load-option 'EDWIN)
-               (if (let ((DISPLAY (get-environment-variable "DISPLAY")))
-                     (and (string? DISPLAY)
-                          (not (string-null? DISPLAY))))
+            (parameterize ((param:suppress-loading-message? #t))
 -             (load-option 'edwin)
 -             (if (let ((display (get-environment-variable "DISPLAY")))
 -                   (and (string? display)
 -                        (not (string-null? display))))
 -                 (ignore-errors (lambda () (load-option 'x11-screen)))))))
++              (load-option 'edwin)
++              (if (let ((display (get-environment-variable "DISPLAY")))
++                    (and (string? display)
++                         (not (string-null? display))))
 +                  (ignore-errors (lambda () (load-option 'x11-screen))))))))
          (apply (environment-lookup (->environment '(edwin)) 'edit) args)))))
  
  (define edwin edit)

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

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