diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-06-11 17:38:11 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-06-11 17:38:11 -0400 |
| commit | 4b2d77d8dbd5b051bb681bacaee4a6faffbbdde9 (patch) | |
| tree | 05153838cc02b867b4fa8d1822809d9b4cff2efe /lisp/emacs-lisp/macroexp.el | |
| parent | 12e009e52f09c27e5b29cf8394eff5e8efdba9b6 (diff) | |
| download | emacs-4b2d77d8dbd5b051bb681bacaee4a6faffbbdde9.tar.gz | |
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bug#19704)
Don't rewrite (funcall 'f ...) to (f ...).
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index ed4d6e49a93..310ca29e9a1 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -261,7 +261,7 @@ Assumes the caller has bound `macroexpand-all-environment'." (format "%s quoted with ' rather than with #'" (list 'lambda (nth 1 f) '...)) (macroexp--expand-all `(,fun ,arg1 ,f . ,args)))) - (`(funcall (,(or 'quote 'function) ,(and f (pred symbolp)) . ,_) . ,args) + (`(funcall #',(and f (pred symbolp)) . ,args) ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' ;; has a compiler-macro. (macroexp--expand-all `(,f . ,args))) |