1 files changed, 24 insertions, 19 deletions

diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index a4776030cf2..85e13952cfb 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1493,25 +1493,27 @@ argument:
 @subsection The @code{cond*} macro
 @findex cond*@r{, a macro}
 
-  The @code{cond*} macro is an alternative to @code{pcase}, and supports
-the same functionality, but using syntax that some might find less
-cryptic.
+  You can use the @code{cond*} macro as an alternative to @code{pcase}
+if you find @code{pcase}'s syntax too cryptic.  In addition,
+@code{cond*} offers some new forms of control flow that aren't related
+to being an alternative to @code{pcase}.
 
 @defmac cond* &rest clauses
 The @code{cond*} macro is an extended form of the traditional
 @code{cond}.  A @code{cond*} expression contains a series of
-@var{clauses}, each of which can use @code{bind*} to specify binding
-variables, use @code{match*} to specify matching a pattern as a
-condition, or specify an expression as a condition to evaluate as a
-test.
+@var{clauses}, each of which can use @code{bind*} or @code{bind-and*} to
+specify binding variables, use @code{match*} or @code{pcase*} to specify
+matching a pattern as a condition, or specify an expression as a
+condition to evaluate as a test.
 
 Each clause normally has the form @w{@code{(@var{condition}
 @var{body}@dots{})}}.
 
 @var{condition} can be a Lisp expression, as in @code{cond}
 (@pxref{Conditionals}).  Or it can be @w{@code{(bind*
-@var{bindings}@dots{})}} or @w{@code{(match* @var{pattern}
-@var{datum})}}.
+@var{bindings}@dots{})}}, @w{@code{(match* @var{pattern} @var{datum})}},
+@w{@code{(bind-and* @var{bindings}@dots{})}} or @w{@code{(pcase*
+@var{pattern} @var{datum})}}
 
 @findex bind*
 @code{(bind* @var{bindings}@dots{})} means to bind @var{bindings} (like
@@ -1536,21 +1538,22 @@ bind to the parts of @var{datum} that they match.
 @code{(pcase* @var{pattern} @var{datum})} works in the same way except it
 uses the Pcase syntax for @var{pattern}.
 
-@code{bind*}, @code{match*}, and @code{pcase*} normally bind their bindings over
-the execution of the whole containing clause.  However, if the clause is
-written to specify ``non-exit'', the clause's bindings cover the whole
-rest of the @code{cond*}.
+@code{match*}, and @code{pcase*} normally bind their bindings over the
+execution of the whole containing clause.  However, if the clause is
+written to specify ``non-exit'' (see below), the clause's bindings cover
+the whole rest of the @code{cond*}.
 
 When a clause's condition is true, and it exits the @code{cond*} or is
 the last clause, the value of the last expression in the clause's body
 becomes the return value of the @code{cond*} construct.
 
-@subheading Non-exit clause
+@subheading Non-exit clauses
 
-If a clause has only one element, or if its first element is @code{t},
-or if it ends with the keyword @code{:non-exit}, then this clause never
-exits the @code{cond*} construct.  Instead, control falls through to the
-next clause (if any).  The bindings made in @var{condition} for the
+If a clause has only one element, or if its first element is @code{t} or
+a @code{bind*} form, or if it ends with the keyword @code{:non-exit},
+then this clause never exits the @code{cond*} construct.  Instead,
+control falls through to the next clause (if any).  Except for a
+@code{bind-and*} clause, the bindings made in @var{condition} for the
 @var{body} of the non-exit clause are passed along to the rest of the
 clauses in this @code{cond*} construct.
 
@@ -2344,7 +2347,9 @@ the other usual filtering mechanisms say it should.  @xref{Error Debugging}.
 The macro @code{condition-case-unless-debug} provides another way to
 handle debugging of such forms.  It behaves exactly like
 @code{condition-case}, unless the variable @code{debug-on-error} is
-non-@code{nil}, in which case it does not handle any errors at all.
+non-@code{nil}, in which case it causes Emacs to enter the debugger
+before executing any applicable handler.  (The applicable handler, if
+any, will still run when the debugger exits.)
 @end defmac
 
   Once Emacs decides that a certain handler handles the error, it