Import Upstream version 3a1upstream/3a1

1 files changed, 13 insertions, 12 deletions

diff --git a/scainit.scm b/scainit.scm
index 93fed1e..dd779e9 100644
--- a/scainit.scm
+++ b/scainit.scm
@@ -18,7 +18,7 @@
 ;;; 92/06/18
 
 (require 'common-list-functions)	;to pick up EVERY
-(define syncase:andmap comlist:every)
+(define syncase:andmap every)
 
 ; In Chez Scheme "(syncase:void)" returns an object that is ignored by the
 ; REP loop.  It is returned whenever a "nonspecified" value is specified
@@ -67,33 +67,34 @@
 (define impl-error slib:error)
 
 (define base:eval slib:eval)
+;@
 (define syncase:eval base:eval)
 (define macro:eval base:eval)
 (define syncase:expand #f)
 (define macro:expand #f)
+
 (define (syncase:expand-install-hook expand)
   (set! syncase:eval (lambda (x) (base:eval (expand x))))
   (set! macro:eval syncase:eval)
   (set! syncase:expand expand)
   (set! macro:expand syncase:expand))
 ;;; We Need This for bootstrapping purposes:
+;@
 (define (syncase:load <pathname>)
   (slib:eval-load <pathname> syncase:eval))
 (define macro:load syncase:load)
-
+;@
 (define syncase:sanity-check #f)
+
 ;;; LOADING THE SYSTEM ITSELF:
-(let ((here (lambda (file)
-	      (in-vicinity (library-vicinity) file)))
-      (scmhere (lambda (file)
-		 (in-vicinity (library-vicinity)
-			      (string-append file (scheme-file-suffix))))))
-  (for-each (lambda (file) (slib:load (here file)))
-	    '("scaoutp"
-	      "scaglob"
-	      "scaexpp"))
+(slib:load (in-vicinity (program-vicinity) "scaoutp"))
+(slib:load (in-vicinity (program-vicinity) "scaglob"))
+(slib:load (in-vicinity (program-vicinity) "scaexpp"))
+
+(let ((scmhere (lambda (file)
+		 (in-vicinity (library-vicinity) file))))
   (syncase:expand-install-hook expand-syntax)
-  (syncase:load (here "scamacr"))
+  (syncase:load (scmhere "scamacr"))
   (set! syncase:sanity-check
 	(lambda ()
 	  (syncase:load (scmhere "sca-exp"))