Import Upstream version 2c3upstream/2c3

1 files changed, 6 insertions, 6 deletions

diff --git a/vscm.init b/vscm.init
index 6868213..6164298 100644
--- a/vscm.init
+++ b/vscm.init
@@ -131,8 +131,8 @@
 ;	transcript			;TRANSCRIPT-ON and TRANSCRIPT-OFF
 ;	char-ready?
 ;	macro				;has R4RS high level macros
-;	defmacro			;has Common Lisp DEFMACRO
-	eval				;SLIB:EVAL is single argument eval
+	defmacro			;has Common Lisp DEFMACRO
+;	eval				;proposed 2-argument eval
 ;	record				;has user defined data structures
 	values				;proposed multiple values
 ;	dynamic-wind			;proposed dynamic-wind
@@ -168,7 +168,7 @@
 (define (output-port-width . arg) 79)
 
 ;;; (CURRENT-ERROR-PORT)
-(define current-error-port
+(define (current-error-port)
   (standard-port 2))
 
 ;;; (TMPNAM) makes a temporary file name.
@@ -269,8 +269,7 @@
 ;;; Return argument
 (define (identity x) x)
 
-;;; If your implementation provides eval SLIB:EVAL is single argument
-;;; eval using the top-level (user) environment.
+;;; SLIB:EVAL is single argument eval using the top-level (user) environment.
 (define slib:eval eval)
 
 ;;; If your implementation provides R4RS macros:
@@ -333,7 +332,8 @@
       (for-each (lambda (x) (display x port)) args))))
 
 ;;; define an error procedure for the library
-(define slib:error error)
+(define (slib:error . argl)
+  (error argl))
 
 ;;; define these as appropriate for your system.
 (define slib:tab #\Tab)