diff options
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index ea238299488..7327d681f9a 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1329,7 +1329,7 @@ Then the value of the last BODY form is returned from the `condition-case' | |||
| 1329 | expression. | 1329 | expression. |
| 1330 | 1330 | ||
| 1331 | The special handler (:success BODY...) is invoked if BODYFORM terminated | 1331 | The special handler (:success BODY...) is invoked if BODYFORM terminated |
| 1332 | without signalling an error. BODY is then evaluated with VAR bound to | 1332 | without signaling an error. BODY is then evaluated with VAR bound to |
| 1333 | the value returned by BODYFORM. | 1333 | the value returned by BODYFORM. |
| 1334 | 1334 | ||
| 1335 | See also the function `signal' for more info. | 1335 | See also the function `signal' for more info. |
| @@ -1716,7 +1716,6 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit) | |||
| 1716 | Lisp_Object clause = Qnil; | 1716 | Lisp_Object clause = Qnil; |
| 1717 | struct handler *h; | 1717 | struct handler *h; |
| 1718 | 1718 | ||
| 1719 | eassert (!itree_iterator_busy_p ()); | ||
| 1720 | if (gc_in_progress || waiting_for_input) | 1719 | if (gc_in_progress || waiting_for_input) |
| 1721 | emacs_abort (); | 1720 | emacs_abort (); |
| 1722 | 1721 | ||
| @@ -1810,7 +1809,7 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit) | |||
| 1810 | unbind_to (count, Qnil); | 1809 | unbind_to (count, Qnil); |
| 1811 | } | 1810 | } |
| 1812 | 1811 | ||
| 1813 | /* If an error is signalled during a Lisp hook in redisplay, write a | 1812 | /* If an error is signaled during a Lisp hook in redisplay, write a |
| 1814 | backtrace into the buffer *Redisplay-trace*. */ | 1813 | backtrace into the buffer *Redisplay-trace*. */ |
| 1815 | if (!debugger_called && !NILP (error_symbol) | 1814 | if (!debugger_called && !NILP (error_symbol) |
| 1816 | && backtrace_on_redisplay_error | 1815 | && backtrace_on_redisplay_error |