diff options
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/eval.c | 8 |
2 files changed, 7 insertions, 2 deletions
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... |