From 57db3f3adc251b628c5aea7e513a66f9305fdd4b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 9 Nov 2014 00:14:25 -0500 Subject: 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. --- lisp/emacs-lisp/byte-run.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/byte-run.el') 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)) -- cgit v1.2.3