Mercurial > emacs

changeset 110696:54ddd26c5a6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invoke kill-emacs on SIGINT on Windows as well. src/emacs.c (main): Remove !WINDOWSNT conditional. (Fkill_emacs): Don't mention exemption on MS-Windows. etc/NEWS: Fix the news entry regarding SIGINT in batch mode.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 02 Oct 2010 10:24:14 +0200
parents 515d80e174ba
children 0186f2ee32d8
files etc/NEWS src/ChangeLog src/emacs.c
diffstat 3 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Fri Oct 01 19:46:13 2010 -0700
+++ b/etc/NEWS	Sat Oct 02 10:24:14 2010 +0200
@@ -150,7 +150,7 @@
 for remote machines which support SELinux.
 
 ** The function kill-emacs is now run upon receipt of the signals SIGTERM
-and SIGHUP, and (except on MS-Windows) SIGINT in batch mode.
+and SIGHUP, and upon SIGINT in batch mode.
 
 ** kill-emacs-hook is now also run in batch mode.
 
--- a/src/ChangeLog	Fri Oct 01 19:46:13 2010 -0700
+++ b/src/ChangeLog	Sat Oct 02 10:24:14 2010 +0200
@@ -1,3 +1,8 @@
+2010-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs.c (main): Remove !WINDOWSNT conditional.
+	(Fkill_emacs): Don't mention exemption on MS-Windows.
+
 2010-10-02  Glenn Morris  <rgm@gnu.org>
 
 	* character.c (Fchar_bytes): Remove obsolete function.
--- a/src/emacs.c	Fri Oct 01 19:46:13 2010 -0700
+++ b/src/emacs.c	Sat Oct 02 10:24:14 2010 +0200
@@ -1240,14 +1240,12 @@
 #ifdef SIGSYS
       signal (SIGSYS, fatal_error_signal);
 #endif
-#ifndef WINDOWSNT
       /*  May need special treatment on MS-Windows. See
           http://lists.gnu.org/archive/html/emacs-devel/2010-09/msg01062.html
           Please update the doc of kill-emacs, kill-emacs-hook, and
           NEWS if you change this.
       */
-      if ( noninteractive ) signal (SIGINT, fatal_error_signal);
-#endif
+      if (noninteractive) signal (SIGINT, fatal_error_signal);
       signal (SIGTERM, fatal_error_signal);
 #ifdef SIGXCPU
       signal (SIGXCPU, fatal_error_signal);
@@ -1997,7 +1995,7 @@
 If ARG is a string, stuff it as keyboard input.
 
 This function is called upon receipt of the signals SIGTERM
-or SIGHUP, and (except on MS-Windows) SIGINT in batch mode.
+or SIGHUP, and upon SIGINT in batch mode.
 
 The value of `kill-emacs-hook', if not void,
 is a list of functions (of no args),