Mercurial > emacs
diff src/emacs.c @ 110696:54ddd26c5a6c
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 | 0554c384e09f |
children | 99084f50aa8e |
line wrap: on
line diff
--- 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),