2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca9c545a37b..a2be1055f46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-07  Nic Ferrier  <nferrier@ferrier.me.uk>
+
+        * emacs-lisp/ert.el (should, should-not, should-error): Add edebug
+        declaration.
+
 2013-04-07  Leo Liu  <sdl.web@gmail.com>
 
         * pcmpl-x.el: New file.
@@ -31,8 +36,8 @@
 
 2013-04-05  Dmitry Gutov  <dgutov@yandex.ru>
 
-        * whitespace.el (whitespace-color-on, whitespace-color-off): Only
-        call `font-lock-fontify-buffer' when `font-lock-mode' is on.
+        * whitespace.el (whitespace-color-on, whitespace-color-off):
+        Only call `font-lock-fontify-buffer' when `font-lock-mode' is on.
 
 2013-04-05  Jacek Chrząszcz  <chrzaszcz@mimuw.edu.pl> (tiny change)
 
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 7df3acccbc9..a9c06b05028 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -464,6 +464,7 @@ FORM-DESCRIPTION-FORM before it has called INNER-FORM."
   "Evaluate FORM.  If it returns nil, abort the current test as failed.
 
 Returns the value of FORM."
+  (declare (debug t)))
   (ert--expand-should `(should ,form) form
                       (lambda (inner-form form-description-form _value-var)
                         `(unless ,inner-form
@@ -473,6 +474,7 @@ Returns the value of FORM."
   "Evaluate FORM.  If it returns non-nil, abort the current test as failed.
 
 Returns nil."
+  (declare (debug t)))
   (ert--expand-should `(should-not ,form) form
                       (lambda (inner-form form-description-form _value-var)
                         `(unless (not ,inner-form)
@@ -520,6 +522,7 @@ non-nil, the error matches TYPE if it is an element of TYPE.
 If the error matches, returns (ERROR-SYMBOL . DATA) from the
 error.  If not, or if no error was signaled, abort the test as
 failed."
+  (declare (debug t))
   (unless type (setq type ''error))
   (ert--expand-should
    `(should-error ,form ,@keys)