summaryrefslogtreecommitdiff
path: root/doc/lispref/elisp.texi
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-05-29 10:07:21 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-05-29 10:07:21 +0200
commit8a09ec0d45cdc8fa54203a0f7cc1a8c909627497 (patch)
tree2b7516e767bea0d86e3f819b6856841083f138b9 /doc/lispref/elisp.texi
parent0f48d18fd2a30f29cc3592a835d2a2254c9b0afb (diff)
parent9d6a3ac73af66184e5bb23555b93833f6a4d9f2e (diff)
downloademacs-8a09ec0d45cdc8fa54203a0f7cc1a8c909627497.tar.gz
Merge from origin/emacs-26
9d6a3ac73a Mention pcase as a fifth conditional form 567cb9046d Overhaul pcase documentation 4d7e54acff Use EXPVAL in docstrings of patterns defined using pcase-d... 7e8227ed68 Introduce EXPVAL for pcase, pcase-defmacro docstrings e6de5b3d51 Ensure pcase doc shows `QPAT first among extensions
Diffstat (limited to 'doc/lispref/elisp.texi')
-rw-r--r--doc/lispref/elisp.texi5
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 9389aa1ba19..7ac9198bf84 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -476,14 +476,11 @@ Control Structures
* Sequencing:: Evaluation in textual order.
* Conditionals:: @code{if}, @code{cond}, @code{when}, @code{unless}.
* Combining Conditions:: @code{and}, @code{or}, @code{not}.
+* Pattern-Matching Conditional:: How to use @code{pcase} and friends.
* Iteration:: @code{while} loops.
* Generators:: Generic sequences and coroutines.
* Nonlocal Exits:: Jumping out of a sequence.
-Conditionals
-
-* Pattern matching case statement:: How to use @code{pcase}.
-
Nonlocal Exits
* Catch and Throw:: Nonlocal exits for the program's own purposes.