From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 20 Aug 2011 21:22:46 +0000 (-0400)
Subject: * eval.c (Fcondition_case): Document `debug' symbol in error handler.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~70^2~15^2~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=024a2d76113268052dd9fa85c915c6fb9f29c152;p=emacs.git

* eval.c (Fcondition_case): Document `debug' symbol in error handler.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index adf7291eadf..82d75d39b40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
 
 	* eval.c (Fsignal): Handle `debug' symbol in error handler (Bug#9329).
+	(Fcondition_case): Document `debug' symbol in error handler.
 
 2011-08-19  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/eval.c b/src/eval.c
index 8b121665ff7..372e9954620 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1357,8 +1357,12 @@ A handler is applicable to an error
 if CONDITION-NAME is one of the error's condition names.
 If an error happens, the first applicable handler is run.
 
-The car of a handler may be a list of condition names
-instead of a single condition name.  Then it handles all of them.
+The car of a handler may be a list of condition names instead of a
+single condition name; then it handles all of them.  If the special
+condition name `debug' is present in this list, it allows another
+condition in the list to run the debugger if `debug-on-error' and the
+other usual mechanisms says it should (otherwise, `condition-case'
+suppresses the debugger).
 
 When a handler handles an error, control returns to the `condition-case'
 and it executes the handler's BODY...