Import Upstream version 3b1upstream/3b1

1 files changed, 11 insertions, 9 deletions

diff --git a/kawa.init b/kawa.init
index 4a261c0..373a17b 100644
--- a/kawa.init
+++ b/kawa.init
@@ -24,11 +24,14 @@
 ;;@ (implementation-vicinity) should be defined to be the pathname of
 ;;; the directory where any auxillary files to your Scheme
 ;;; implementation reside.
-(define (implementation-vicinity)
-  (case (software-type)
-    ((unix) "/usr/local/src/kawa/")
-    ;;((vms)	"scheme$src:")
-    ((ms-dos) "C:\\kawa\\")))
+(define implementation-vicinity
+  (let ((impl-path
+	 (case (software-type)
+	   ((unix) "/usr/local/src/kawa/")
+	   ;;((vms) "scheme$src:")
+	   ((ms-dos) "C:\\kawa\\")
+	   (else ""))))
+    (lambda () impl-path)))
 
 ;;@ (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
@@ -98,8 +101,7 @@
 ;@
 (define sub-vicinity
   (case (software-type)
-    ((vms) (lambda
-	       (vic name)
+    ((vms) (lambda (vic name)
 	     (let ((l (string-length vic)))
 	       (if (or (zero? (string-length vic))
 		       (not (char=? #\] (string-ref vic (- l 1)))))
@@ -140,6 +142,7 @@
 					;(SLIB:LOAD-COMPILED "filename")
 	vicinity
 	srfi-59
+	srfi-96
 
 		       ;; Scheme report features
    ;; R5RS-compliant implementations should provide all 9 features.
@@ -181,7 +184,7 @@
 
 			;; Other common features
 
-	srfi				;srfi-0, COND-EXPAND finds all srfi-*
+	srfi-0				;srfi-0, COND-EXPAND finds all srfi-*
 ;;;	sicp				;runs code from Structure and
 					;Interpretation of Computer
 					;Programs by Abelson and Sussman.
@@ -302,7 +305,6 @@
 ;@
 (define (defmacro:load <pathname>)
   (slib:eval-load <pathname> defmacro:eval))
-;; slib:eval-load definition moved to "require.scm"
 ;@
 (define slib:warn
   (lambda args