From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 15 Feb 2019 00:50:18 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-10.1.10~6
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5f53f1e8546e97440353aa5057f9e2c2c67479bd;p=mit-scheme.git

Merge branch 'master' into pucked.
---

5f53f1e8546e97440353aa5057f9e2c2c67479bd
diff --cc src/imail/compile.scm
index 12e9e04c4,48dda2c03..ee999c225
--- a/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/runtime/runtime.pkg
index 6173a6652,8820d7981..68efa0186
--- a/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 53802e836,59d96dcd2..7c7b1d8b3
--- a/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 c3a6f6dfc,d7070ad56..4e1a659d4
--- a/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 fbd02e2e9,5b4cf9c36..c8b6ce278
--- a/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 1e40b3501,63e5cbd2a..8d6cd326b
--- a/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
  
 -(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 8f5a0dca7,0e594288c..c5ec18323
--- a/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 --