summaryrefslogtreecommitdiff
path: root/doc/lispref/control.texi
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnu.org>2018-05-26 09:44:10 +0200
committerThien-Thi Nguyen <ttn@gnu.org>2018-05-27 17:15:19 +0200
commit9d6a3ac73af66184e5bb23555b93833f6a4d9f2e (patch)
tree01383b24781f384fed1526ca6cd401fe433d7115 /doc/lispref/control.texi
parent567cb9046d098b617c76541a75516ac6ef563be7 (diff)
downloademacs-9d6a3ac73af66184e5bb23555b93833f6a4d9f2e.tar.gz
Mention pcase as a fifth conditional formfix/bug-31311-pcase-doc-squash
* doc/lispref/control.texi (Conditionals): ...here, in first para, w/ xref to "Pattern-Matching Conditional".
Diffstat (limited to 'doc/lispref/control.texi')
-rw-r--r--doc/lispref/control.texi6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 72dacdf1e0f..9e1bd6b3ecb 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -148,9 +148,11 @@ following @var{forms}, in textual order, returning the result of
@cindex conditional evaluation
Conditional control structures choose among alternatives. Emacs Lisp
-has four conditional forms: @code{if}, which is much the same as in
+has five conditional forms: @code{if}, which is much the same as in
other languages; @code{when} and @code{unless}, which are variants of
-@code{if}; and @code{cond}, which is a generalized case statement.
+@code{if}; @code{cond}, which is a generalized case statement;
+and @code{pcase}, which is a generalization of @code{cond}
+(@pxref{Pattern-Matching Conditional}).
@defspec if condition then-form else-forms@dots{}
@code{if} chooses between the @var{then-form} and the @var{else-forms}