From 383ebd154fe44e38f38937e8cff3c2abe3fab310 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 2 Oct 2010 10:24:14 +0200 Subject: [PATCH] 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. --- etc/NEWS | 2 +- src/ChangeLog | 5 +++++ src/emacs.c | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index ce38a796773..62132847efc 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -150,7 +150,7 @@ get and set the SELinux context of a file. 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. diff --git a/src/ChangeLog b/src/ChangeLog index 292dc31b5e3..d09c4a1394c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-02 Eli Zaretskii + + * emacs.c (main): Remove !WINDOWSNT conditional. + (Fkill_emacs): Don't mention exemption on MS-Windows. + 2010-10-02 Glenn Morris * character.c (Fchar_bytes): Remove obsolete function. diff --git a/src/emacs.c b/src/emacs.c index 7eba690cb8a..41f091bd656 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1240,14 +1240,12 @@ main (int argc, char **argv) #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 an integer, return ARG as the exit program code. 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), -- 2.39.5