From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.devel Subject: Re: Emacs daemon doesn't terminate on SIGTERM any more Date: Sat, 23 Oct 2010 00:51:37 +0200 Message-ID: <19650.5497.137779.175728@a1i15.kph.uni-mainz.de> References: <19649.19677.433824.461239@a1i15.kph.uni-mainz.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1287787921 1388 80.91.229.12 (22 Oct 2010 22:52:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 22 Oct 2010 22:52:01 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 23 00:52:00 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P9QSr-0002cq-Ig for ged-emacs-devel@m.gmane.org; Sat, 23 Oct 2010 00:51:57 +0200 Original-Received: from localhost ([127.0.0.1]:48272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9QSr-0000b7-5k for ged-emacs-devel@m.gmane.org; Fri, 22 Oct 2010 18:51:57 -0400 Original-Received: from [140.186.70.92] (port=36573 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9QSm-0000b0-82 for emacs-devel@gnu.org; Fri, 22 Oct 2010 18:51:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9QSl-000258-3B for emacs-devel@gnu.org; Fri, 22 Oct 2010 18:51:52 -0400 Original-Received: from a1iwww1.kph.uni-mainz.de ([134.93.134.1]:51161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9QSk-00023l-RS for emacs-devel@gnu.org; Fri, 22 Oct 2010 18:51:51 -0400 Original-Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1iwww1.kph.uni-mainz.de (8.14.0/8.13.4) with ESMTP id o9MMpbO4032233 for ; Sat, 23 Oct 2010 00:51:37 +0200 Original-Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.3/8.14.2) with ESMTP id o9MMpb6r016737; Sat, 23 Oct 2010 00:51:37 +0200 Original-Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.4/8.14.4/Submit) id o9MMpb1d016734; Sat, 23 Oct 2010 00:51:37 +0200 In-Reply-To: <19649.19677.433824.461239@a1i15.kph.uni-mainz.de> X-Mailer: VM 8.1.1 under 23.2.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132008 Archived-At: >>>>> On Fri, 22 Oct 2010, Ulrich Mueller wrote: > Then I try to kill it from another terminal window: > $ kill > 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); }