From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 11 Jun 2016 21:38:11 +0000 (-0400)
Subject: * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bug#19704)
X-Git-Tag: emacs-25.1-rc1~96
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b2d77d;p=emacs.git

* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bug#19704)

Don't rewrite (funcall 'f ...) to (f ...).
---

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)))