From d1a6bccc995f7e1e9d22a386e1aac0d7c888ff18 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 20 Nov 2013 21:46:00 -0500 Subject: [PATCH] * lisp/emacs-lisp/byte-run.el (eval-when-compile): Fix edebug spec. (make-obsolete): Remove interactive spec. Fixes: debbugs:14646 --- lisp/ChangeLog | 10 ++++++++-- lisp/emacs-lisp/byte-run.el | 11 +++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d24ab3bc837..ecec50e930d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-11-21 Stefan Monnier + + * emacs-lisp/byte-run.el (eval-when-compile): Fix edebug spec + (bug#14646). + (make-obsolete): Remove interactive spec. + 2013-11-21 Glenn Morris * startup.el (command-line-1): Use path-separator with -L. @@ -29,8 +35,8 @@ * obsolete/rcompile.el: Mark obsolete. * progmodes/compile.el (compilation-start) - (compilation-goto-locus, compilation-find-file): Pass - no-display-ok and handle nil value from display-buffer. + (compilation-goto-locus, compilation-find-file): + Pass no-display-ok and handle nil value from display-buffer. (Bug#13594) * window.el (display-buffer-alist, display-buffer): Document the diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 7ec24cc2aad..6beef7165d1 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -112,10 +112,10 @@ to set this property.") ''edebug-form-spec (list 'quote spec))))) defun-declarations-alist) "List associating properties of macros to their macro expansion. -Each element of the list takes the form (PROP FUN) where FUN is -a function. For each (PROP . VALUES) in a macro's declaration, -the FUN corresponding to PROP is called with the function name -and the VALUES and should return the code to use to set this property.") +Each element of the list takes the form (PROP FUN) where FUN is a function. +For each (PROP . VALUES) in a macro's declaration, the FUN corresponding +to PROP is called with the macro name, the macro's arglist, and the VALUES +and should return the code to use to set this property.") (put 'defmacro 'doc-string-elt 3) (put 'defmacro 'lisp-indent-function 2) @@ -285,7 +285,6 @@ was first made obsolete, for example a date or a release number." (declare (advertised-calling-convention ;; New code should always provide the `when' argument. (obsolete-name current-name when) "23.1")) - (interactive "aMake function obsolete: \nxObsoletion replacement: ") (put obsolete-name 'byte-obsolete-info ;; The second entry used to hold the `byte-compile' handler, but ;; is not used any more nowadays. @@ -392,7 +391,7 @@ If you think you need this, you're probably making a mistake somewhere." "Like `progn', but evaluates the body at compile time if you're compiling. Thus, the result of the body appears to the compiler as a quoted constant. In interpreted code, this is entirely equivalent to `progn'." - (declare (debug t) (indent 0)) + (declare (debug (def-body)) (indent 0)) (list 'quote (eval (cons 'progn body) lexical-binding))) (defmacro eval-and-compile (&rest body) -- 2.39.2