Re: Emacs daemon doesn't terminate on SIGTERM any more

[Ulrich Mueller]

>>>>> On Fri, 22 Oct 2010, Ulrich Mueller wrote:

> Then I try to kill it from another terminal window:

>    $ kill <pid of emacs process>

> With Emacs 23.2 the process would properly terminate now. The BZR
> version asks for interactive input in the open terminal frame instead:

>     The current server still has clients; delete them? (yes or no)

> Therefore the process doesn't terminate.

The problem is caused by the following change (introduced in May):

--- a/src/emacs.c
+++ b/src/emacs.c
@@ -385,6 +386,9 @@ fatal_error_signal (sig)
     {
       fatal_error_in_progress = 1;
 
+      if (sig == SIGTERM || sig == SIGHUP)
+        Fkill_emacs (make_number (sig));
+
       shut_down_emacs (sig, 0, Qnil);
     }