diff options
| author | Po Lu | 2024-07-16 10:15:59 +0800 |
|---|---|---|
| committer | Po Lu | 2024-07-16 10:15:59 +0800 |
| commit | 06ce99b76a8e5823f003f4e0dee945d97d0271ea (patch) | |
| tree | 567d917f1bfe3682b9f131cabdc7a4dc134fb625 /src/eval.c | |
| parent | 0fc8d8836701f928a124ac13c32e6dae7f55ee37 (diff) | |
| parent | 72c8e0df87b0776451f9065f3432a8ebecee974d (diff) | |
| download | emacs-06ce99b76a8e5823f003f4e0dee945d97d0271ea.tar.gz emacs-06ce99b76a8e5823f003f4e0dee945d97d0271ea.zip | |
Merge remote-tracking branch 'savannah/master' into master-android-1
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c index 1e0628b4aa3..2161ab1e1ea 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1857,14 +1857,6 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool continuable) | |||
| 1857 | if (gc_in_progress || waiting_for_input) | 1857 | if (gc_in_progress || waiting_for_input) |
| 1858 | emacs_abort (); | 1858 | emacs_abort (); |
| 1859 | 1859 | ||
| 1860 | #if 0 /* rms: I don't know why this was here, | ||
| 1861 | but it is surely wrong for an error that is handled. */ | ||
| 1862 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 1863 | if (display_hourglass_p) | ||
| 1864 | cancel_hourglass (); | ||
| 1865 | #endif | ||
| 1866 | #endif | ||
| 1867 | |||
| 1868 | /* This hook is used by edebug. */ | 1860 | /* This hook is used by edebug. */ |
| 1869 | if (! NILP (Vsignal_hook_function) | 1861 | if (! NILP (Vsignal_hook_function) |
| 1870 | && !oom) | 1862 | && !oom) |