Import Upstream version 3a5upstream/3a5

1 files changed, 8 insertions, 2 deletions

diff --git a/mitscheme.init b/mitscheme.init
index be3df51..97d1efc 100644
--- a/mitscheme.init
+++ b/mitscheme.init
@@ -236,6 +236,12 @@
 (define difftime -)
 (define offset-time +)
 
+;;@ (FILE-POSITION <port> . <k>)
+(define (file-position port . args)
+  (if (null? args)
+      (port-position port)
+      (apply set-port-position! port args)))
+
 ;;; (OUTPUT-PORT-WIDTH <port>)
 (define output-port-width output-port/x-size)
 
@@ -366,7 +372,7 @@
 		       form)))))))
   (if mit-scheme-has-r4rs-macros?
       (let ((e (->environment '(runtime syntactic-closures))))
-	(let ((transformer-item/expander (access transformer-item/expander e))
+	(let ((strip-keyword-value-item (access strip-keyword-value-item e))
 	      (expander-item/expander (access expander-item/expander e))
 	      (expander-item/environment (access expander-item/environment e)))
 	  (finish
@@ -378,7 +384,7 @@
 			 (environment-lookup-macro user-initial-environment
 						   a)))))
 	   (lambda (item form)
-	     (let ((item (transformer-item/expander item)))
+	     (let ((item (strip-keyword-value-item item)))
 	       ((expander-item/expander item)
 		form
 		user-initial-environment