From 5bea21e81ed516440e34e480f2c33ca41aa8c597 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:36 -0800 Subject: Import Upstream version 3a4 --- elk.init | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'elk.init') 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) -- cgit v1.2.3