diff options
| author | Stefan Monnier | 2016-06-11 17:38:11 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2016-06-11 17:38:11 -0400 |
| commit | 4b2d77d8dbd5b051bb681bacaee4a6faffbbdde9 (patch) | |
| tree | 05153838cc02b867b4fa8d1822809d9b4cff2efe | |
| parent | 12e009e52f09c27e5b29cf8394eff5e8efdba9b6 (diff) | |
| download | emacs-4b2d77d8dbd5b051bb681bacaee4a6faffbbdde9.tar.gz emacs-4b2d77d8dbd5b051bb681bacaee4a6faffbbdde9.zip | |
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bug#19704)
Don't rewrite (funcall 'f ...) to (f ...).
| -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'." | |||
| 261 | (format "%s quoted with ' rather than with #'" | 261 | (format "%s quoted with ' rather than with #'" |
| 262 | (list 'lambda (nth 1 f) '...)) | 262 | (list 'lambda (nth 1 f) '...)) |
| 263 | (macroexp--expand-all `(,fun ,arg1 ,f . ,args)))) | 263 | (macroexp--expand-all `(,fun ,arg1 ,f . ,args)))) |
| 264 | (`(funcall (,(or 'quote 'function) ,(and f (pred symbolp)) . ,_) . ,args) | 264 | (`(funcall #',(and f (pred symbolp)) . ,args) |
| 265 | ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' | 265 | ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' |
| 266 | ;; has a compiler-macro. | 266 | ;; has a compiler-macro. |
| 267 | (macroexp--expand-all `(,f . ,args))) | 267 | (macroexp--expand-all `(,f . ,args))) |