diff options
| author | Andrea Corallo | 2020-04-23 08:41:15 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-04-23 08:41:15 +0100 |
| commit | 301cf0d27892f76b7967d7f71d48a1899c27d477 (patch) | |
| tree | 54b69e63a34b5df6324b4f93ee2c7ae1406bd9e0 /src/eval.c | |
| parent | 65cc8efa333bbb66acd7b19f4b39c3138995e864 (diff) | |
| parent | 7b15cc3ebb45e50ac5faf3bbc2a813afffdaa418 (diff) | |
| download | emacs-301cf0d27892f76b7967d7f71d48a1899c27d477.tar.gz emacs-301cf0d27892f76b7967d7f71d48a1899c27d477.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 6de81e5467f..1091b082552 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1238,7 +1238,7 @@ The car of a handler may be a list of condition names instead of a | |||
| 1238 | single condition name; then it handles all of them. If the special | 1238 | single condition name; then it handles all of them. If the special |
| 1239 | condition name `debug' is present in this list, it allows another | 1239 | condition name `debug' is present in this list, it allows another |
| 1240 | condition in the list to run the debugger if `debug-on-error' and the | 1240 | condition in the list to run the debugger if `debug-on-error' and the |
| 1241 | other usual mechanisms says it should (otherwise, `condition-case' | 1241 | other usual mechanisms say it should (otherwise, `condition-case' |
| 1242 | suppresses the debugger). | 1242 | suppresses the debugger). |
| 1243 | 1243 | ||
| 1244 | When a handler handles an error, control returns to the `condition-case' | 1244 | When a handler handles an error, control returns to the `condition-case' |