* emacs.c (main): Convert three 'signal' calls to 'sigaction' calls.

Problem introduced when merging patches.  Noted by Eli Zaretskii in
<http://bugs.gnu.org/12327#67>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cab03fca500aec75196ac2027ea4ea908fdaeda..e4c94a2616b5decf94e401b186be12dd4c6f53f5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,9 @@
 2012-09-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        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
+       <http://bugs.gnu.org/12327#67>.
        * 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 ff50f409d5cb9f82e92af42dd32901273fa58192..36e51869504fb34d78c921570a7e6efcd8e4be43 100644 (file)
--- 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