[Emacs-diffs] /srv/bzr/emacs/trunk r105507: * eval.c (Fcondition_case): Document `debug' symbol in error handler.

[Chong Yidong]

------------------------------------------------------------
revno: 105507
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-20 17:22:46 -0400
message:
  * eval.c (Fcondition_case): Document `debug' symbol in error handler.
modified:
  src/ChangeLog
  src/eval.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-20 21:17:06 +0000
+++ b/src/ChangeLog     2011-08-20 21:22:46 +0000
@@ -1,6 +1,7 @@
 2011-08-20  Chong Yidong  <address@hidden>
 
        * eval.c (Fsignal): Handle `debug' symbol in error handler (Bug#9329).
+       (Fcondition_case): Document `debug' symbol in error handler.
 
 2011-08-19  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/eval.c'
--- a/src/eval.c        2011-08-20 21:17:06 +0000
+++ b/src/eval.c        2011-08-20 21:22:46 +0000
@@ -1357,8 +1357,12 @@
 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...