From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 25 Dec 2013 22:37:04 +0000 (+0000)
Subject: byte-run.el (eval-when-compile), cc-defs.el (cc-eval-when-compile): Fix edebug spec... 
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~188
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38b2c142f4a0678d9106138233c4c2e2b4d340a4;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c2154db0e..2ddb03b097b 100644
--- 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 6beef7165d1..2afc52f2c17 100644
--- 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 b90a01dcb3b..6183257c6a1 100644
--- 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)