byte-run.el (eval-when-compile), cc-defs.el (cc-eval-when-compile): Fix edebug spec...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c2154db0e6cf8cd0013f6e814eb20d9c08aaa8..2ddb03b097b59d295c9ed959936595bd9afeea05 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * emacs-lisp/byte-run.el (eval-when-compile):
+       * lisp/progmodes/cc-defs.el (cc-eval-when-compile):
+       Fix edebug spec (bug#16184).
+
 2013-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * net/shr.el (shr-visit-file): Remove debugging function.

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 6beef7165d1680325138ca4253c1b3a6a70fbd1f..2afc52f2c1739b19f7704f0099c54051e3ecfbbe 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -391,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 (def-body)) (indent 0))
+  (declare (debug (&rest def-form)) (indent 0))
   (list 'quote (eval (cons 'progn body) lexical-binding)))
 
 (defmacro eval-and-compile (&rest body)

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index b90a01dcb3bbfae7c77df4463c311dd755f30acb..6183257c6a110f1be3b7b3bc6b2844733005b9d4 100644 (file)
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1137,7 +1137,7 @@ been put there by c-put-char-property.  POINT remains unchanged."
 ;; Make edebug understand the macros.
 ;(eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
 ;  '(progn
-(def-edebug-spec cc-eval-when-compile t)
+(def-edebug-spec cc-eval-when-compile (&rest def-form))
 (def-edebug-spec c-point t)
 (def-edebug-spec c-set-region-active t)
 (def-edebug-spec c-safe t)