1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 64E47429E29
\r
6 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 20:13:42 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id xGQBv+46UKtU for <notmuch@notmuchmail.org>;
\r
16 Wed, 11 Jan 2012 20:13:42 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id E45BB429E25
\r
20 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 20:13:41 -0800 (PST)
\r
21 X-AuditID: 12074422-b7fd66d0000008f9-03-4f0e5df544b9
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id A5.BE.02297.5FD5E0F4; Wed, 11 Jan 2012 23:13:41 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0C4DeW3017077;
\r
27 Wed, 11 Jan 2012 23:13:41 -0500
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0C4DdNo017385
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Wed, 11 Jan 2012 23:13:40 -0500 (EST)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1RlC2q-0004me-Up; Wed, 11 Jan 2012 23:13:45 -0500
\r
37 Date: Wed, 11 Jan 2012 23:13:44 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: Tomi Ollila <tomi.ollila@iki.fi>
\r
40 Subject: Re: [PATCH] make (kill-emacs) from emacsclient work with emacs
\r
42 Message-ID: <20120112041344.GZ20796@mit.edu>
\r
43 References: <87d3b01qus.fsf@qmul.ac.uk>
\r
44 <1326293378-25248-1-git-send-email-tomi.ollila@iki.fi>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 Content-Disposition: inline
\r
48 In-Reply-To: <1326293378-25248-1-git-send-email-tomi.ollila@iki.fi>
\r
49 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
50 X-Brightmail-Tracker:
\r
51 H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1v0ay+dv8GaCuMX1mzOZLd6snMfq
\r
52 wORx+OtCFo9nq24xBzBFcdmkpOZklqUW6dslcGWs+ryYsWAvd8XsdxtZGhgXcnYxcnJICJhI
\r
53 rNy6ixXCFpO4cG89WxcjF4eQwD5Gie9nFjFDOBsYJa4ef8kEUiUkcJJJon2BKkRiCaPElE+X
\r
54 wRIsAqoSN5esZQSx2QQ0JLbtXw5miwioSDxoWw+2gllAWuLb72awemGBIIknt6+zgNi8AjoS
\r
55 1ydcZYFYkCBx5cxXdoi4oMTJmU9YIHq1JG78AzmCA2zO8n8cIGFOAWeJ9R9OsoHYokCrppzc
\r
56 xjaBUWgWku5ZSLpnIXQvYGRexSibklulm5uYmVOcmqxbnJyYl5dapGuql5tZopeaUrqJERTW
\r
57 7C5KOxh/HlQ6xCjAwajEw7tjL6+/EGtiWXFl7iFGSQ4mJVFeI2BUCPEl5adUZiQWZ8QXleak
\r
58 Fh9ilOBgVhLhdaoBKudNSaysSi3Kh0lJc7AoifOqa73zExJITyxJzU5NLUgtgsnKcHAoSfD+
\r
59 iQEaKliUmp5akZaZU4KQZuLgBBnOAzRcG2Qxb3FBYm5xZjpE/hSjopQ4LxtIQgAkkVGaB9cL
\r
60 SzuvGMWBXhHm/QGyggeYsuC6XwENZgIavGUdD8jgkkSElFQDY+HKh4n568SO3gn8uNFqRYdu
\r
61 2usd+zOLphs7ie0yY1FkkjDZdnbJxS0ak1urjrMIiykq9Adq75yvyP9OvG7b5ctHdq/8MXOi
\r
62 gfUegwnzuR15jpU8eV5UZ7fk5qRiTZcE4ZIqkYsS6nUPY588mPE6MztK48H9Y7KvMw4pPAvk
\r
63 +rEr1UTq14uHKUosxRmJhlrMRcWJAOkIATYWAwAA
\r
64 Cc: notmuch@notmuchmail.org
\r
65 X-BeenThere: notmuch@notmuchmail.org
\r
66 X-Mailman-Version: 2.1.13
\r
68 List-Id: "Use and development of the notmuch mail system."
\r
69 <notmuch.notmuchmail.org>
\r
70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
73 List-Post: <mailto:notmuch@notmuchmail.org>
\r
74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
76 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
77 X-List-Received-Date: Thu, 12 Jan 2012 04:13:42 -0000
\r
79 This is important to fix, but this solution seems needlessly
\r
80 roundabout. What about using an after-advice and simply delq'ing
\r
81 whatever the offending hook is? That wouldn't even need a version
\r
84 Quoth Tomi Ollila on Jan 11 at 4:49 pm:
\r
85 > emacsclient --eval '(kill-emacs)' doesn't work without interactive
\r
86 > user input. By removing the hook which asks user input makes things
\r
87 > work well enough in our test cases.
\r
89 > test/test-lib.el | 13 +++++++++++++
\r
90 > 1 files changed, 13 insertions(+), 0 deletions(-)
\r
92 > diff --git a/test/test-lib.el b/test/test-lib.el
\r
93 > index 3b817c3..c52854e 100644
\r
94 > --- a/test/test-lib.el
\r
95 > +++ b/test/test-lib.el
\r
96 > @@ -26,6 +26,19 @@
\r
98 > (setq read-file-name-function (lambda (&rest _) (read)))
\r
100 > +;; Work around a bug in emacs 23.1 and emacs 23.2 which prevents
\r
101 > +;; noninteractive (kill-emacs) from emacsclient.
\r
102 > +(when (and (= emacs-major-version 23) (< emacs-minor-version 3))
\r
103 > + (require 'server)
\r
104 > + (fset 'server-start-real (symbol-function 'server-start))
\r
105 > + (defun server-start (&optional leave-dead)
\r
106 > + (interactive "P")
\r
107 > + (let ((hc (length kill-emacs-hook)))
\r
108 > + (unwind-protect
\r
109 > + (server-start-real leave-dead)
\r
110 > + (if (> (length kill-emacs-hook) hc)
\r
111 > + (setq kill-emacs-hook (cdr kill-emacs-hook)))))))
\r
113 > (defun notmuch-test-wait ()
\r
114 > "Wait for process completion."
\r
115 > (while (get-buffer-process (current-buffer))
\r