From eddb36a7d58b99e43deadcc808347008fe8a8627 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 7 Sep 2012 01:55:03 -0700 Subject: [PATCH] * emacs.c (main): Convert three 'signal' calls to 'sigaction' calls. Problem introduced when merging patches. Noted by Eli Zaretskii in . --- src/ChangeLog | 3 +++ src/emacs.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8cab03fca50..e4c94a2616b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,9 @@ 2012-09-07 Paul Eggert More signal-handler cleanup (Bug#12327). + * emacs.c (main): Convert three 'signal' calls to 'sigaction' calls. + Problem introduced when merging patches. Noted by Eli Zaretskii in + . * floatfns.c: Comment fix. * lisp.h (force_auto_save_soon): Declare regardless of SIGDANGER. SIGDANGER might not be in scope so "#ifdef SIGDANGER" is not right, diff --git a/src/emacs.c b/src/emacs.c index ff50f409d5c..36e51869504 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1144,9 +1144,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem /* Don't catch these signals in batch mode if dumping. On some machines, this sets static data that would make signal fail to work right when the dumped Emacs is run. */ - signal (SIGQUIT, deliver_fatal_signal); - signal (SIGILL, deliver_fatal_signal); - signal (SIGTRAP, deliver_fatal_signal); + sigaction (SIGQUIT, &fatal_error_action, 0); + sigaction (SIGILL, &fatal_error_action, 0); + sigaction (SIGTRAP, &fatal_error_action, 0); #ifdef SIGUSR1 add_user_signal (SIGUSR1, "sigusr1"); #endif -- 2.39.2