Import Upstream version 3a4upstream/3a4

1 files changed, 8 insertions, 6 deletions

diff --git a/jscheme.init b/jscheme.init
index 95caa8d..241a2d8 100644
--- a/jscheme.init
+++ b/jscheme.init
@@ -157,9 +157,9 @@
 	(exchange old)
 	val))))
 
-;;@ *FEATURES* should be set to a list of symbols describing features
+;;@ SLIB:FEATURES should be set to a list of symbols describing features
 ;;; of this implementation.  Suggestions for features are:
-(define *features*
+(define slib:features
       '(
 	source				;can load scheme source files
 					;(SLIB:LOAD-SOURCE "filename")
@@ -388,12 +388,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 . args)
-  (if (provided? 'trace) (print-call-stack (current-error-port)))
-  (apply error args))
+(define slib:error
+  (let ((error error))
+    (lambda args
+      (if (provided? 'trace) (print-call-stack (current-error-port)))
+      (apply error args))))
 ;@
 (define (make-exchanger obj)
   (lambda (rep) (let ((old obj)) (set! obj rep) old)))