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/byte-run.el | |
| parent | f86269414156e4d91458f2c70a0f022b92caa6ba (diff) | |
| download | emacs-57db3f3adc251b628c5aea7e513a66f9305fdd4b.tar.gz emacs-57db3f3adc251b628c5aea7e513a66f9305fdd4b.tar.bz2 emacs-57db3f3adc251b628c5aea7e513a66f9305fdd4b.zip | |
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/byte-run.el')
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 97768fa7e1a..1f8b04ec8f0 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -115,8 +115,7 @@ If `error-free', drop calls even if `byte-compile-delete-errors' is nil.") (if (not (eq (car-safe compiler-function) 'lambda)) `(eval-and-compile (function-put ',f 'compiler-macro #',compiler-function)) - (let ((cfname (intern (concat (symbol-name f) - "--anon-compiler-macro")))) + (let ((cfname (intern (concat (symbol-name f) "--anon-cmacro")))) `(progn (eval-and-compile (function-put ',f 'compiler-macro #',cfname)) |