0.7.1.26:

[sbcl.git] / src / code / macroexpand.lisp

diff --git a/src/code/macroexpand.lisp b/src/code/macroexpand.lisp
index 4806e01..b1049bd 100644 (file)
--- a/src/code/macroexpand.lisp
+++ b/src/code/macroexpand.lisp
@@ -50,11 +50,11 @@
                                ;; in what it sends and liberal in what it
                                ;; accepts" by doing the defaulting itself.
                                ;; -- WHN 19991128
-                               (or env (make-null-lexenv)))
+                               (coerce-to-lexenv env))
                       t)
               (values form nil))))
        ((symbolp form)
-        (let* ((venv (when env (sb!c::lexenv-variables env)))
+        (let* ((venv (when env (sb!c::lexenv-vars env)))
                (local-def (cdr (assoc form venv))))
           (if (and (consp local-def)
                    (eq (car local-def) 'macro))