aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/control.texi17
2 files changed, 12 insertions, 9 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4f6a92ef5f3..8b55cfddec2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-10-09 Glenn Morris <rgm@gnu.org>
2
3 * control.texi (Conditionals): Copyedits. (Bug#15558)
4
12013-10-08 Eli Zaretskii <eliz@gnu.org> 52013-10-08 Eli Zaretskii <eliz@gnu.org>
2 6
3 Support menus on text-mode terminals. 7 Support menus on text-mode terminals.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 70eabcd84a4..34a02aab69d 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -218,15 +218,11 @@ list is the @var{condition}; the remaining elements, if any, the
218@code{cond} tries the clauses in textual order, by evaluating the 218@code{cond} tries the clauses in textual order, by evaluating the
219@var{condition} of each clause. If the value of @var{condition} is 219@var{condition} of each clause. If the value of @var{condition} is
220non-@code{nil}, the clause ``succeeds''; then @code{cond} evaluates its 220non-@code{nil}, the clause ``succeeds''; then @code{cond} evaluates its
221@var{body-forms}, and the value of the last of @var{body-forms} becomes 221@var{body-forms}, and returns the value of the last of @var{body-forms}.
222the value of the @code{cond}. The remaining clauses are ignored. 222Any remaining clauses are ignored.
223 223
224If the value of @var{condition} is @code{nil}, the clause ``fails'', so 224If the value of @var{condition} is @code{nil}, the clause ``fails'', so
225the @code{cond} moves on to the following clause, trying its 225the @code{cond} moves on to the following clause, trying its @var{condition}.
226@var{condition}.
227
228If every @var{condition} evaluates to @code{nil}, so that every clause
229fails, @code{cond} returns @code{nil}.
230 226
231A clause may also look like this: 227A clause may also look like this:
232 228
@@ -235,8 +231,11 @@ A clause may also look like this:
235@end example 231@end example
236 232
237@noindent 233@noindent
238Then, if @var{condition} is non-@code{nil} when tested, the value of 234Then, if @var{condition} is non-@code{nil} when tested, the @code{cond}
239@var{condition} becomes the value of the @code{cond} form. 235form returns the value of @var{condition}.
236
237If every @var{condition} evaluates to @code{nil}, so that every clause
238fails, @code{cond} returns @code{nil}.
240 239
241The following example has four clauses, which test for the cases where 240The following example has four clauses, which test for the cases where
242the value of @code{x} is a number, string, buffer and symbol, 241the value of @code{x} is a number, string, buffer and symbol,