From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 31 Dec 1988 06:39:18 +0000 (+0000)
Subject: Fix site loading mechanism; previous try didn't work.
X-Git-Tag: 20090517-FFI~12305
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3fde1965dfb4e7d8102e2b29f4b629552211f350;p=mit-scheme.git

Fix site loading mechanism; previous try didn't work.
---

diff --git a/v7/src/runtime/make.scm b/v7/src/runtime/make.scm
index d73e06f77..92527948e 100644
--- a/v7/src/runtime/make.scm
+++ b/v7/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.8 1988/12/31 06:05:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.9 1988/12/31 06:39:18 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -376,14 +376,9 @@ MIT in each case. |#
    (RUNTIME EMACS-INTERFACE)
    ))
 
-(let ((pathname
-       (let ((pathname (->pathname "site")))
-	 (list-search-positive
-	     (map (lambda (type) (pathname-new-type pathname type))
-		  load/default-types)
-	   file-exists?))))
-  (if pathname
-      (load pathname '())))
+(let ((filename (map-filename "site")))
+  (if (file-exists? filename)
+      (eval (purify (fasload filename true)) system-global-environment)))
 
 (let ((fasload/update-debugging-info!
        (access fasload/update-debugging-info!
diff --git a/v8/src/runtime/make.scm b/v8/src/runtime/make.scm
index 23b08fd6c..1f520a3ce 100644
--- a/v8/src/runtime/make.scm
+++ b/v8/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.8 1988/12/31 06:05:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.9 1988/12/31 06:39:18 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -376,14 +376,9 @@ MIT in each case. |#
    (RUNTIME EMACS-INTERFACE)
    ))
 
-(let ((pathname
-       (let ((pathname (->pathname "site")))
-	 (list-search-positive
-	     (map (lambda (type) (pathname-new-type pathname type))
-		  load/default-types)
-	   file-exists?))))
-  (if pathname
-      (load pathname '())))
+(let ((filename (map-filename "site")))
+  (if (file-exists? filename)
+      (eval (purify (fasload filename true)) system-global-environment)))
 
 (let ((fasload/update-debugging-info!
        (access fasload/update-debugging-info!