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.
This commit is contained in:
parent
3226d6cacf
commit
383ebd154f
3 changed files with 8 additions and 5 deletions
2
etc/NEWS
2
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.
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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),
|
||||
|
|
Loading…
Add table
Reference in a new issue