Import Upstream version 3a4upstream/3a4

1 files changed, 11 insertions, 12 deletions

diff --git a/scheme2c.init b/scheme2c.init
index 1bfbde4..ccc9a84 100644
--- a/scheme2c.init
+++ b/scheme2c.init
@@ -7,7 +7,7 @@
 ;; NB this is for the 01nov91 (and, presumably, later ones,
 ;; although those may not need the bug fixes done at the end).
 ;; Earlier versions definitely aren't rev4 conformant.  Check
-;; `ieee-floating-point' and `system' in *features* for non-Sun un*x
+;; `ieee-floating-point' and `system' in slib:features for non-Sun un*x
 ;; versions and `system' and the vicinity stuff (at least) for
 ;; non-un*x versions.
 
@@ -126,9 +126,9 @@
 	(exchange old)
 	val))))
 
-;;@ *FEATURES* is a list of symbols naming the (SLIB) features
+;;@ SLIB:FEATURES is a list of symbols naming the (SLIB) features
 ;;; initially supported by this implementation.
-(define *features*
+(define slib:features
       '(
 	source				;can load scheme source files
 					;(SLIB:LOAD-SOURCE "filename")
@@ -347,17 +347,16 @@
     (let ((cep (current-error-port)))
       (if (provided? 'trace) (print-call-stack cep))
       (display "Warn: " cep)
-      (for-each (lambda (x) (display #\  cep) (write x cep)) args))))
+      (for-each (lambda (x) (display #\space cep) (write x cep)) args))))
 
 ;; define an error procedure for the library
-(define (slib:error . args)
-  (if (provided? 'trace) (print-call-stack (current-error-port)))
-  (error 'slib-error: "~a"
-	 (apply string-append
-		(map
-		 (lambda (a)
-		   (format " ~a" a))
-		 args))))
+(define slib:error
+  (let ((error error))
+    (lambda args
+      (if (provided? 'trace) (print-call-stack (current-error-port)))
+      (error 'slib-error: "~a"
+	     (apply string-append
+		    (map (lambda (a) (format " ~a" a)) args))))))
 
 ;; define these as appropriate for your system.
 (define slib:tab (integer->char 9))