~ chicken-core (chicken-5) 5d858598c04fd772c9f8b19cb0de9d236029a471

commit 5d858598c04fd772c9f8b19cb0de9d236029a471
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Feb 12 13:18:39 2011 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Feb 12 13:18:39 2011 +0100

    fixed name in NEWS; trivial changes

diff --git a/NEWS b/NEWS
index 39602e3a..827f2fb0 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@
   - the `-accumulate-profile' option did not provide a way to
     specify the target profile data file - now `-profile-name'
     must always be given when accumulated profiling is done
-    (thanks to Tayler Venable)
+    (thanks to Taylor Venable)
   - added `-module' option, which wraps the code into an implicit
     module
   - removed check for unsafe toplevel calls in safe mode
diff --git a/compiler.scm b/compiler.scm
index a7d08eb5..af6b673b 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -863,7 +863,8 @@
 				   (canonicalize-begin-body
 				    (append
 				     (parameterize ((##sys#current-module #f)
-						    (##sys#macro-environment (##sys#meta-macro-environment)))
+						    (##sys#macro-environment 
+						     (##sys#meta-macro-environment)))
 				       (map
 					(lambda (x)
 					  (walk 
diff --git a/eval.scm b/eval.scm
index b84eca64..c3d28c6d 100644
--- a/eval.scm
+++ b/eval.scm
@@ -234,11 +234,13 @@
       (define (eval/meta form)
 	(parameterize ((##sys#current-module #f)
 		       (##sys#macro-environment (##sys#meta-macro-environment)))
-	    ((##sys#compile-to-closure
-	      form
-	      '() 
-	      (##sys#current-meta-environment))
-	     '() ) ))
+	  ;;XXX definitions extending the macro-env will be lost after
+	  ;;    this body exits, or not?
+	  ((##sys#compile-to-closure
+	    form
+	    '() 
+	    (##sys#current-meta-environment))
+	   '() ) ))
 
       (define (eval/elab form)
 	((##sys#compile-to-closure
diff --git a/expand.scm b/expand.scm
index 4dbf1016..20337cdd 100644
--- a/expand.scm
+++ b/expand.scm
@@ -912,7 +912,8 @@
 				     (##sys#current-environment '())
 				     (##sys#current-meta-environment 
 				      (##sys#current-meta-environment))
-				     (##sys#macro-environment (##sys#meta-macro-environment)))
+				     (##sys#macro-environment
+				      (##sys#meta-macro-environment)))
 			(fluid-let ((##sys#notices-enabled #f)) ; to avoid re-import warnings
 			  (##sys#load il #f #f)))
 		      (set! mod (##sys#find-module mname)))
@@ -1069,7 +1070,8 @@
 (##sys#extend-macro-environment
  'import-for-syntax '() 
  (##sys#er-transformer 
-  (cut ##sys#expand-import <> <> <> ##sys#current-meta-environment ##sys#meta-macro-environment 
+  (cut ##sys#expand-import <> <> <> ##sys#current-meta-environment 
+       ##sys#meta-macro-environment 
        #t #f 'import-for-syntax) ) )
 
 (##sys#extend-macro-environment