[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101724: Invoke kill-emacs on SIGINT
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101724: Invoke kill-emacs on SIGINT on Windows as well. |
Date: |
Sat, 02 Oct 2010 10:24:14 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101724
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 10:24:14 +0200
message:
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.
modified:
etc/NEWS
src/ChangeLog
src/emacs.c
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2010-10-02 02:46:13 +0000
+++ b/etc/NEWS 2010-10-02 08:24:14 +0000
@@ -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.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-10-02 02:46:13 +0000
+++ b/src/ChangeLog 2010-10-02 08:24:14 +0000
@@ -1,3 +1,8 @@
+2010-10-02 Eli Zaretskii <address@hidden>
+
+ * emacs.c (main): Remove !WINDOWSNT conditional.
+ (Fkill_emacs): Don't mention exemption on MS-Windows.
+
2010-10-02 Glenn Morris <address@hidden>
* character.c (Fchar_bytes): Remove obsolete function.
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2010-10-02 02:30:11 +0000
+++ b/src/emacs.c 2010-10-02 08:24:14 +0000
@@ -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),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101724: Invoke kill-emacs on SIGINT on Windows as well.,
Eli Zaretskii <=