[Emacs-diffs] trunk r115749: byte-run.el (eval-when-compile), cc-defs.el (cc-eval-when-compile): Fix edebug spec (bug#16184)

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 115749
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-25 22:37:04 +0000
message:
  byte-run.el (eval-when-compile), cc-defs.el (cc-eval-when-compile): Fix 
edebug spec (bug#16184)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/byte-run.el    byterun.el-20091113204419-o5vbwnq5f7feedwu-2586
  lisp/progmodes/cc-defs.el      ccdefs.el-20091113204419-o5vbwnq5f7feedwu-1226

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-25 19:38:08 +0000
+++ b/lisp/ChangeLog    2013-12-25 22:37:04 +0000
@@ -1,3 +1,9 @@
+2013-12-25  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/shr.el (shr-visit-file): Remove debugging function.

=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el       2013-11-21 02:46:00 +0000
+++ b/lisp/emacs-lisp/byte-run.el       2013-12-25 22:37:04 +0000
@@ -391,7 +391,7 @@
   "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)

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2013-06-01 20:08:52 +0000
+++ b/lisp/progmodes/cc-defs.el 2013-12-25 22:37:04 +0000
@@ -1137,7 +1137,7 @@
 ;; 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)