From: Joe Marshall <jmarshall@alum.mit.edu>
Date: Tue, 24 Nov 2009 00:30:41 +0000 (-0800)
Subject: Don't run-boot-inits! if saved-boot-inits is unbound.
X-Git-Tag: 20100708-Gtk~237
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=48c092700c17a94bd5107cd6caf81f53214027ca;p=mit-scheme.git

Don't run-boot-inits! if saved-boot-inits is unbound.
---

diff --git a/src/runtime/boot.scm b/src/runtime/boot.scm
index 4a23baf03..805870522 100644
--- a/src/runtime/boot.scm
+++ b/src/runtime/boot.scm
@@ -158,11 +158,12 @@ USA.
     ((ucode-primitive local-assignment) environment saved-boot-inits inits)))
 
 (define (run-boot-inits! environment)
-  (let ((inits
-	 ((ucode-primitive lexical-reference) environment saved-boot-inits)))
-    ((ucode-primitive unbind-variable) environment saved-boot-inits)
-    (for-each (lambda (init) (init))
-	      inits)))
+  (and (not (lexical-unreferenceable? environment saved-boot-inits))
+       (let ((inits
+	      ((ucode-primitive lexical-reference) environment saved-boot-inits)))
+	 ((ucode-primitive unbind-variable) environment saved-boot-inits)
+	 (for-each (lambda (init) (init))
+		   inits))))
 
 (define boot-inits #f)
 (define saved-boot-inits '|#[saved-boot-inits]|)
\ No newline at end of file