aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNic Ferrier2013-04-07 14:56:28 -0400
committerStefan Monnier2013-04-07 14:56:28 -0400
commite3e7b504b2b0148e62ea444300a8fb389ef39a09 (patch)
tree5fdd0bd1a6381c85fe90ef0134047bde1fdf5aef
parent7d9f6883aad738362a8321955b1c1f76e8f7aea1 (diff)
downloademacs-e3e7b504b2b0148e62ea444300a8fb389ef39a09.tar.gz
emacs-e3e7b504b2b0148e62ea444300a8fb389ef39a09.zip
* lisp/emacs-lisp/ert.el (should, should-not, should-error): Add edebug
declaration.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/emacs-lisp/ert.el3
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 @@
12013-04-07 Nic Ferrier <nferrier@ferrier.me.uk>
2
3 * emacs-lisp/ert.el (should, should-not, should-error): Add edebug
4 declaration.
5
12013-04-07 Leo Liu <sdl.web@gmail.com> 62013-04-07 Leo Liu <sdl.web@gmail.com>
2 7
3 * pcmpl-x.el: New file. 8 * pcmpl-x.el: New file.
@@ -31,8 +36,8 @@
31 36
322013-04-05 Dmitry Gutov <dgutov@yandex.ru> 372013-04-05 Dmitry Gutov <dgutov@yandex.ru>
33 38
34 * whitespace.el (whitespace-color-on, whitespace-color-off): Only 39 * whitespace.el (whitespace-color-on, whitespace-color-off):
35 call `font-lock-fontify-buffer' when `font-lock-mode' is on. 40 Only call `font-lock-fontify-buffer' when `font-lock-mode' is on.
36 41
372013-04-05 Jacek Chrząszcz <chrzaszcz@mimuw.edu.pl> (tiny change) 422013-04-05 Jacek Chrząszcz <chrzaszcz@mimuw.edu.pl> (tiny change)
38 43
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."
464 "Evaluate FORM. If it returns nil, abort the current test as failed. 464 "Evaluate FORM. If it returns nil, abort the current test as failed.
465 465
466Returns the value of FORM." 466Returns the value of FORM."
467 (declare (debug t)))
467 (ert--expand-should `(should ,form) form 468 (ert--expand-should `(should ,form) form
468 (lambda (inner-form form-description-form _value-var) 469 (lambda (inner-form form-description-form _value-var)
469 `(unless ,inner-form 470 `(unless ,inner-form
@@ -473,6 +474,7 @@ Returns the value of FORM."
473 "Evaluate FORM. If it returns non-nil, abort the current test as failed. 474 "Evaluate FORM. If it returns non-nil, abort the current test as failed.
474 475
475Returns nil." 476Returns nil."
477 (declare (debug t)))
476 (ert--expand-should `(should-not ,form) form 478 (ert--expand-should `(should-not ,form) form
477 (lambda (inner-form form-description-form _value-var) 479 (lambda (inner-form form-description-form _value-var)
478 `(unless (not ,inner-form) 480 `(unless (not ,inner-form)
@@ -520,6 +522,7 @@ non-nil, the error matches TYPE if it is an element of TYPE.
520If the error matches, returns (ERROR-SYMBOL . DATA) from the 522If the error matches, returns (ERROR-SYMBOL . DATA) from the
521error. If not, or if no error was signaled, abort the test as 523error. If not, or if no error was signaled, abort the test as
522failed." 524failed."
525 (declare (debug t))
523 (unless type (setq type ''error)) 526 (unless type (setq type ''error))
524 (ert--expand-should 527 (ert--expand-should
525 `(should-error ,form ,@keys) 528 `(should-error ,form ,@keys)