[Sbcl-commits] CVS: sbcl/src/code macroexpand.lisp,1.8,1.9

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14218/src/code

Modified Files:
	macroexpand.lisp 
Log Message:
0.9.5.29:
	Fix bug reported by Matthew D Swank on comp.lang.lisp
	... macroexpand-1 shouldn't expand a global symbol macro
		if there's a local binding in the environment.
	... (setf wasn't getting this wrong, because it was converting
		immediately to setq, but push was, because it calls
		get-setf-expansion)


Index: macroexpand.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/macroexpand.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- macroexpand.lisp	14 Jul 2005 16:30:36 -0000	1.8
+++ macroexpand.lisp	7 Oct 2005 04:57:09 -0000	1.9
@@ -58,6 +58,8 @@
            (cond ((and (consp local-def)
                        (eq (car local-def) 'macro))
                   (values (cdr local-def) t))
+                 (local-def
+                  (values form nil))
                  ((eq (info :variable :kind form) :macro)
                   (values (info :variable :macro-expansion form) t))
                  (t