diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-11-09 00:14:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-11-09 00:14:25 -0500 |
| commit | 57db3f3adc251b628c5aea7e513a66f9305fdd4b (patch) | |
| tree | 01d3492c1fa689324330151d57ed06da9faca6c3 /lisp/emacs-lisp/macroexp.el | |
| parent | f86269414156e4d91458f2c70a0f022b92caa6ba (diff) | |
| download | emacs-57db3f3adc251b628c5aea7e513a66f9305fdd4b.tar.gz | |
Fix bootstrap failure after last change to eval-and-compile.
* lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
Don't call byte-compile-preprocess since the result will go through cconv.
(byte-compile-output-docform): Handle uninterned `name' correctly.
* lisp/emacs-lisp/cl-macs.el (cl-define-compiler-macro): Use interned name
to circumvent byte-compiler bug.
* lisp/emacs-lisp/cl-extra.el (cl-get): Silence compiler warning.
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix typo.
(macroexp--compiler-macro): Remove left-over debug code.
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index fc859e7af09..a1dc6fa05b2 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -97,8 +97,6 @@ each clause." (condition-case err (apply handler form (cdr form)) (error - (message "--------------------------------------------------") - (backtrace) (message "Compiler-macro error for %S: %S" (car form) err) form))) @@ -251,7 +249,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 (,(or 'quote 'function) ,(and f (pred symbolp)) . ,_) . ,args) ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' ;; has a compiler-macro. (macroexp--expand-all `(,f . ,args))) |