From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.bugs Subject: bug#8942: 23.3; emacsclient doesn't exit when called Emacs function is quited. Date: Mon, 4 Jul 2011 16:41:58 +0200 Message-ID: References: <87d3hzpqcj.dlv@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1309790617 17368 80.91.229.12 (4 Jul 2011 14:43:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 4 Jul 2011 14:43:37 +0000 (UTC) Cc: Remi Vanicat , 8942@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 04 16:43:33 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QdkN3-0000FV-Ff for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Jul 2011 16:43:33 +0200 Original-Received: from localhost ([::1]:53799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QdkN2-0001ge-5N for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Jul 2011 10:43:32 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:49634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QdkMc-0001fp-0p for bug-gnu-emacs@gnu.org; Mon, 04 Jul 2011 10:43:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QdkMZ-00011p-IX for bug-gnu-emacs@gnu.org; Mon, 04 Jul 2011 10:43:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QdkMY-00011d-K7 for bug-gnu-emacs@gnu.org; Mon, 04 Jul 2011 10:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QdkMX-0002SW-Vw; Mon, 04 Jul 2011 10:43:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 04 Jul 2011 14:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8942 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 8942-submit@debbugs.gnu.org id=B8942.13097905669431 (code B ref 8942); Mon, 04 Jul 2011 14:43:01 +0000 Original-Received: (at 8942) by debbugs.gnu.org; 4 Jul 2011 14:42:46 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QdkMH-0002S4-QF for submit@debbugs.gnu.org; Mon, 04 Jul 2011 10:42:46 -0400 Original-Received: from mail-pv0-f172.google.com ([74.125.83.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QdkMG-0002Rr-3T for 8942@debbugs.gnu.org; Mon, 04 Jul 2011 10:42:45 -0400 Original-Received: by pvh18 with SMTP id 18so4944415pvh.3 for <8942@debbugs.gnu.org>; Mon, 04 Jul 2011 07:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=Nv1e4NYUqNgRC4MKpY/fR5ueXSjrCjsf5A0Ix4rpPaU=; b=OqmrI9j0lkbRgQjXe1xdf2wKsVrZ7ot44S3ZgKmPm2XHlfcV9EDUAmI+HTZjcB3Urp mkSDwa+YUR1bt5VGlCn2E2L5DwpJeZIgnNWMQs6Zy2nZYn3eY90noCMGkXMpK2jeTFNF uDpZqkjinhWOrrqBlw7Mongif6TTitpZhRyDU= Original-Received: by 10.142.118.24 with SMTP id q24mr2781092wfc.392.1309790558098; Mon, 04 Jul 2011 07:42:38 -0700 (PDT) Original-Received: by 10.142.48.6 with HTTP; Mon, 4 Jul 2011 07:41:58 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 04 Jul 2011 10:43:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:47948 Archived-At: On Mon, Jul 4, 2011 at 16:32, Stefan Monnier wro= te: > Returning a -error would be fine, yes. But if server-execute catches quit, the whole with-local-quit is not necessary anymore, is it? I mean, this patch (shown with -b) fixes the bug report. But when the user types Ctrl-G in Emacs, he has less feedback because he doesn't see the "Quit" message anymore. =C2=A0 =C2=A0 Juanma =3D=3D=3D modified file 'lisp/server.el' --- lisp/server.el 2011-07-04 01:04:29 +0000 +++ lisp/server.el 2011-07-04 14:37:13 +0000 @@ -1121,7 +1121,6 @@ ;; inhibit-quit flag, which is good since `commands' (as well as ;; find-file-noselect via the major-mode) can run arbitrary code, ;; including code that needs to wait. - (with-local-quit (condition-case err (let* ((buffers (when files @@ -1153,7 +1152,7 @@ "When done with a buffer, type \\[server-edit]"))))) (when (and frame (null tty-name)) (server-unselect-display frame))) - (error (server-return-error proc err))))) + ((quit error) (server-return-error proc err)))) (defun server-return-error (proc err) (ignore-errors