[Emacs-diffs] /srv/bzr/emacs/trunk r109922: * emacs.c (main): Convert three 'signal' calls to 'sigaction' calls.

[Paul Eggert]

------------------------------------------------------------
revno: 109922
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-07 01:55:03 -0700
message:
  * 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>.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-07 08:46:44 +0000
+++ b/src/ChangeLog     2012-09-07 08:55:03 +0000
@@ -1,6 +1,9 @@
 2012-09-07  Paul Eggert  <address@hidden>
 
        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,

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-09-07 01:27:44 +0000
+++ b/src/emacs.c       2012-09-07 08:55:03 +0000
@@ -1144,9 +1144,9 @@
       /* 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