From b5771c0d82b0c1b376e53d8bb92ec4137901db67 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 4 Jul 2012 10:42:59 -0400 Subject: [PATCH] * lisp/emacs-lisp/bytecomp.el (byte-compile): Don't signal an error if the function is already compiled. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/bytecomp.el | 40 +++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 250aaa3bde4..34a74656415 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-07-04 Stefan Monnier + * emacs-lisp/bytecomp.el (byte-compile): Don't signal an error if the + function is already compiled. + * xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re. 2012-07-03 Michael Albinus diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 71b61ec74cc..76b147a4c65 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2485,22 +2485,32 @@ If FORM is a lambda or a macro, byte-compile it as a function." (macro (eq (car-safe fun) 'macro))) (if macro (setq fun (cdr fun))) - (when (symbolp form) - (unless (memq (car-safe fun) '(closure lambda)) + (cond + ;; Up until Emacs-24.1, byte-compile silently did nothing when asked to + ;; compile something invalid. So let's tune down the complaint from an + ;; error to a simple message for the known case where signaling an error + ;; causes problems. + ((byte-code-function-p fun) + (message "Function %s is already compiled" + (if (symbolp form) form "provided")) + fun) + (t + (when (symbolp form) + (unless (memq (car-safe fun) '(closure lambda)) + (error "Don't know how to compile %S" fun)) + (setq fun (byte-compile--reify-function fun)) + (setq lexical-binding (eq (car fun) 'closure))) + (unless (eq (car-safe fun) 'lambda) (error "Don't know how to compile %S" fun)) - (setq fun (byte-compile--reify-function fun)) - (setq lexical-binding (eq (car fun) 'closure))) - (unless (eq (car-safe fun) 'lambda) - (error "Don't know how to compile %S" fun)) - ;; Expand macros. - (setq fun (byte-compile-preprocess fun)) - ;; Get rid of the `function' quote added by the `lambda' macro. - (if (eq (car-safe fun) 'function) (setq fun (cadr fun))) - (setq fun (byte-compile-lambda fun)) - (if macro (push 'macro fun)) - (if (symbolp form) - (fset form fun) - fun))))) + ;; Expand macros. + (setq fun (byte-compile-preprocess fun)) + ;; Get rid of the `function' quote added by the `lambda' macro. + (if (eq (car-safe fun) 'function) (setq fun (cadr fun))) + (setq fun (byte-compile-lambda fun)) + (if macro (push 'macro fun)) + (if (symbolp form) + (fset form fun) + fun))))))) (defun byte-compile-sexp (sexp) "Compile and return SEXP." -- 2.39.2