aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-10-31 17:02:51 -0400
committerGlenn Morris2012-10-31 17:02:51 -0400
commitdd90fd1a45ddef772b52f67a89648be787c05dd5 (patch)
tree4704293bf79454ea364edfd5535cb74003579f3d
parent88390adf4088a332a4c0c9659b3cc3ae87eef30a (diff)
downloademacs-dd90fd1a45ddef772b52f67a89648be787c05dd5.tar.gz
emacs-dd90fd1a45ddef772b52f67a89648be787c05dd5.zip
Trivial ert.texi update for cl-lib namespace
* doc/misc/ert.texi (Introduction, The @code{should} Macro): Refer to "cl-assert" rather than "assert".
-rw-r--r--doc/misc/ChangeLog3
-rw-r--r--doc/misc/ert.texi4
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 11fe77ea471..b77147fb0d7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,8 @@
12012-10-31 Glenn Morris <rgm@gnu.org> 12012-10-31 Glenn Morris <rgm@gnu.org>
2 2
3 * ert.texi (Introduction, The @code{should} Macro):
4 Refer to "cl-assert" rather than "assert".
5
3 * cl.texi (Function Bindings): Update for cl-flet and cl-labels. 6 * cl.texi (Function Bindings): Update for cl-flet and cl-labels.
4 (Obsolete Lexical Binding): Rename section from "Lexical Bindings". 7 (Obsolete Lexical Binding): Rename section from "Lexical Bindings".
5 (Obsolete Macros): Rename section from "Obsolete Lexical Macros". 8 (Obsolete Macros): Rename section from "Obsolete Lexical Macros".
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index b357b3d5e67..b585b68daa8 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -130,7 +130,7 @@ familiar: This example defines a test named @code{pp-test-quote} that
130will pass if the three calls to @code{equal} all return true 130will pass if the three calls to @code{equal} all return true
131(non-nil). 131(non-nil).
132 132
133@code{should} is a macro with the same meaning as @code{assert} but 133@code{should} is a macro with the same meaning as @code{cl-assert} but
134better error reporting. @xref{The @code{should} Macro}. 134better error reporting. @xref{The @code{should} Macro}.
135 135
136Each test should have a name that describes what functionality it tests. 136Each test should have a name that describes what functionality it tests.
@@ -342,7 +342,7 @@ to find where a test was defined if the test was loaded from a file.
342Test bodies can include arbitrary code; but to be useful, they need to 342Test bodies can include arbitrary code; but to be useful, they need to
343check whether the code being tested (or @emph{code under test}) 343check whether the code being tested (or @emph{code under test})
344does what it is supposed to do. The macro @code{should} is similar to 344does what it is supposed to do. The macro @code{should} is similar to
345@code{assert} from the cl package 345@code{cl-assert} from the cl package
346(@pxref{Assertions,,, cl, Common Lisp Extensions}), 346(@pxref{Assertions,,, cl, Common Lisp Extensions}),
347but analyzes its argument form and records information that ERT can 347but analyzes its argument form and records information that ERT can
348display to help debugging. 348display to help debugging.