diff options
| author | Noam Postavsky | 2018-08-09 21:26:30 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2018-09-04 18:50:15 -0400 |
| commit | 425c2811641a6b8ec4549cad5f6bd15a46bc95d5 (patch) | |
| tree | 18bdf8e19e80624d0c22fe6bba70e35a1e022c27 /src/eval.c | |
| parent | 21637d5e5b29d5ec8fb966c0ddfbfba3eb33da38 (diff) | |
| download | emacs-425c2811641a6b8ec4549cad5f6bd15a46bc95d5.tar.gz emacs-425c2811641a6b8ec4549cad5f6bd15a46bc95d5.zip | |
Allow t as a catch-all condition-case handler (Bug#24618)
* src/eval.c (find_handler_clause): Accept a handler of t as always
matching.
(Fcondition_case):
* doc/lispref/control.texi (Handling Errors): Document this.
* etc/NEWS: Announce it.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 50de60c936c..1011fc888b5 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1215,9 +1215,9 @@ Executes BODYFORM and returns its value if no error happens. | |||
| 1215 | Each element of HANDLERS looks like (CONDITION-NAME BODY...) | 1215 | Each element of HANDLERS looks like (CONDITION-NAME BODY...) |
| 1216 | where the BODY is made of Lisp expressions. | 1216 | where the BODY is made of Lisp expressions. |
| 1217 | 1217 | ||
| 1218 | A handler is applicable to an error | 1218 | A handler is applicable to an error if CONDITION-NAME is one of the |
| 1219 | if CONDITION-NAME is one of the error's condition names. | 1219 | error's condition names. A CONDITION-NAME of t applies to any error |
| 1220 | If an error happens, the first applicable handler is run. | 1220 | symbol. If an error happens, the first applicable handler is run. |
| 1221 | 1221 | ||
| 1222 | The car of a handler may be a list of condition names instead of a | 1222 | The car of a handler may be a list of condition names instead of a |
| 1223 | single condition name; then it handles all of them. If the special | 1223 | single condition name; then it handles all of them. If the special |
| @@ -1854,7 +1854,9 @@ find_handler_clause (Lisp_Object handlers, Lisp_Object conditions) | |||
| 1854 | for (h = handlers; CONSP (h); h = XCDR (h)) | 1854 | for (h = handlers; CONSP (h); h = XCDR (h)) |
| 1855 | { | 1855 | { |
| 1856 | Lisp_Object handler = XCAR (h); | 1856 | Lisp_Object handler = XCAR (h); |
| 1857 | if (!NILP (Fmemq (handler, conditions))) | 1857 | if (!NILP (Fmemq (handler, conditions)) |
| 1858 | /* t is also used as a catch-all by Lisp code. */ | ||
| 1859 | || EQ (handler, Qt)) | ||
| 1858 | return handlers; | 1860 | return handlers; |
| 1859 | } | 1861 | } |
| 1860 | 1862 | ||