diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-10-02 10:24:14 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-10-02 10:24:14 +0200 |
| commit | 383ebd154fe44e38f38937e8cff3c2abe3fab310 (patch) | |
| tree | b9cacfb7d94e2a14a4c078c8fee829e92fec77e8 /src/emacs.c | |
| parent | 3226d6cacf15156b8760600be0c6b2aac4dac26d (diff) | |
| download | emacs-383ebd154fe44e38f38937e8cff3c2abe3fab310.tar.gz | |
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.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 6 |
1 files changed, 2 insertions, 4 deletions
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), |