Import Upstream version 3a4upstream/3a4

1 files changed, 8 insertions, 6 deletions

diff --git a/RScheme.init b/RScheme.init
index 292b963..544bca1 100644
--- a/RScheme.init
+++ b/RScheme.init
@@ -134,9 +134,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")
@@ -331,12 +331,14 @@
     (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 msg . args)
-  (if (provided? 'trace) (print-call-stack (current-error-port)))
-  (error "~a ~j" msg args))
+(define slib:error
+  (let ((error error))
+    (lambda (msg . args)
+      (if (provided? 'trace) (print-call-stack (current-error-port)))
+      (error "~a ~j" msg args))))
 
 ;;; define these as appropriate for your system.
 (define slib:tab (integer->char 9))