Import Upstream version 3a4upstream/3a4

1 files changed, 15 insertions, 16 deletions

diff --git a/elk.init b/elk.init
index 7d8fa54..09dc940 100644
--- a/elk.init
+++ b/elk.init
@@ -138,9 +138,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")
@@ -359,23 +359,22 @@
     (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
-  (lambda args
-(define (slib:error . args)
-  (if (provided? 'trace) (print-call-stack (current-error-port)))
-  (apply s48-error args))
-    (let ((port (open-output-string))
-	  (err (if (and (pair? args) (symbol? (car args)))
-		   (car args) 'slib))
-	  (args (if (and (pair? args) (symbol? (car args)))
-		    (cdr args) args)))
-      (for-each (lambda (x) (display x port) (display " " port)) args)
-      (let ((str (get-output-string port)))
-	(close-output-port port)
-	(error err str)))))
+  (let ((error error))
+    (lambda args
+      (if (provided? 'trace) (print-call-stack (current-error-port)))
+      (let ((port (open-output-string))
+	    (err (if (and (pair? args) (symbol? (car args)))
+		     (car args) 'slib))
+	    (args (if (and (pair? args) (symbol? (car args)))
+		      (cdr args) args)))
+	(for-each (lambda (x) (display x port) (display " " port)) args)
+	(let ((str (get-output-string port)))
+	  (close-output-port port)
+	  (error err str))))))
 
 ;;; define these as appropriate for your system.
 (define slib:tab #\tab)