From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 24 Feb 2017 23:28:16 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~220
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=6105020a3743814d5cfe24bb986513c6dd943c98;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

6105020a3743814d5cfe24bb986513c6dd943c98
diff --cc src/edwin/edwin.sf
index 36887a4c2,b0ddb5f0c..7cb405f82
--- a/src/edwin/edwin.sf
+++ b/src/edwin/edwin.sf
@@@ -34,9 -29,16 +34,16 @@@ USA
  (if (not (name->package '(EDWIN)))
      (let ((package-set (package-set-pathname "edwin")))
        (if (not (file-exists? package-set))
 -	  (cref/generate-trivial-constructor "edwin"))
 +	  (cref/generate-trivial-constructor "edwin" #f))
        (construct-packages-from-file (fasload package-set))))
  
+ (if (lexical-unreferenceable? (->environment '(EDWIN STRING))
+ 			      'STRING?)
+     (begin
+       (fluid-let ((sf/default-syntax-table (->environment '(EDWIN))))
+ 	(sf-conditionally "string"))
+       (load "string.bin" '(EDWIN STRING))))
+ 
  (if (lexical-unreferenceable? (->environment '(EDWIN CLASS-CONSTRUCTOR))
  			      'CLASS-DESCRIPTORS)
      (begin