diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-31 17:35:35 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-31 17:35:35 -0400 |
| commit | d5262b384e9a831340b906e3a0db5f11984736b0 (patch) | |
| tree | d36d6805587ea6fdcde683ca04eca3832641f3ee /lisp/emacs-lisp/gv.el | |
| parent | b645a03e5cd981e73bd278202bd47629895598fd (diff) | |
| download | emacs-d5262b384e9a831340b906e3a0db5f11984736b0.tar.gz | |
* lisp/emacs-lisp/macroexp.el (macroexpand-1): New function.
(macroexp--expand-all): Unrelated tweaks.
* lisp/emacs-lisp/gv.el (gv-get): Use macroexpand-1.
Fixes: debbugs:18821
Diffstat (limited to 'lisp/emacs-lisp/gv.el')
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 229ad275bf5..a0f92a5f94a 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -89,10 +89,10 @@ DO must return an Elisp expression." (let* ((head (car place)) (gf (function-get head 'gv-expander 'autoload))) (if gf (apply gf do (cdr place)) - (let ((me (macroexpand place ;FIXME: expand one step at a time! - ;; (append macroexpand-all-environment - ;; gv--macro-environment) - macroexpand-all-environment))) + (let ((me (macroexpand-1 place + ;; (append macroexpand-all-environment + ;; gv--macro-environment) + macroexpand-all-environment))) (if (and (eq me place) (get head 'compiler-macro)) ;; Expand compiler macros: this takes care of all the accessors ;; defined via cl-defsubst, such as cXXXr and defstruct slots. |