From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 10 Oct 2018 16:35:00 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-9.2.19~2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7c52f93e074013313cf1ccd5b3b67ab509547526;p=mit-scheme.git

Merge branch 'master' into pucked.
---

7c52f93e074013313cf1ccd5b3b67ab509547526
diff --cc dist/shared.sh
index 159e550a6,881edc04a..0ed9d674e
--- a/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 src/edwin/make.scm
index fd559b6ab,d1cdee9ff..adac79d18
--- a/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/make.scm
index 0e19a8aa7,604b24a37..7190dc501
--- a/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 7412d9308,873cac585..ef75663c9
--- a/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)