Re: [PATCH] test: make (kill-emacs) from emacsclient work with emacs 23.(1|2)

diff --git a/c7/c330f3c5c13caafbc2728afc6ecefc93f2c849 b/c7/c330f3c5c13caafbc2728afc6ecefc93f2c849
new file mode 100644 (file)
index 0000000..6abab96
--- /dev/null
+++ b/c7/c330f3c5c13caafbc2728afc6ecefc93f2c849
@@ -0,0 +1,112 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 16DAE41ED70\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 11:18:19 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9UsEvP2hNIBA for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jan 2012 11:18:18 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 903E842119C\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 11:18:18 -0800 (PST)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-e3-4f1083799380\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DF.E6.02272.973801F4; Fri, 13 Jan 2012 14:18:18 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q0DJIHbD026913; \r
+       Fri, 13 Jan 2012 14:18:17 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0DJIFFZ001349\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 13 Jan 2012 14:18:16 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Rlmdj-0008OE-HU; Fri, 13 Jan 2012 14:18:15 -0500\r
+Date: Fri, 13 Jan 2012 14:18:15 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>\r
+Subject: Re: [PATCH] test: make (kill-emacs) from emacsclient work with emacs\r
+       23.(1|2)\r
+Message-ID: <20120113191815.GJ18625@mit.edu>\r
+References: <20120112170244.GB18625@mit.edu>\r
+       <1326442648-5060-1-git-send-email-tomi.ollila@iki.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1326442648-5060-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42IR4hRV1q1qFvA3uDmZ0eL6zZnMFm9WzmN1\r
+       YPI4/HUhi8ezVbeYA5iiuGxSUnMyy1KL9O0SuDLe3T7OXnCIq2Lfxw9MDYyHOboYOTkkBEwk\r
+       NvRtZ4GwxSQu3FvP1sXIxSEksI9RYsLFJnYIZwOjxMszt5kgnJNMEpu7r0FlljBKLJvxC6yf\r
+       RUBV4m3rQ3YQm01AQ2Lb/uWMILaIgIrEg7b1rCA2s4C0xLffzUwgtrBAhMS1W0/BbF4BHYn2\r
+       kxA1QgIpEstWzmWFiAtKnJz5hAWiV0vixr+XQPUcYHOW/wN7gVPASaKn8QFYiSjQqiknt7FN\r
+       YBSahaR7FpLuWQjdCxiZVzHKpuRW6eYmZuYUpybrFicn5uWlFula6OVmluilppRuYgQFNruL\r
+       6g7GCYeUDjEKcDAq8fBKZgn4C7EmlhVX5h5ilORgUhLlfdEAFOJLyk+pzEgszogvKs1JLT7E\r
+       KMHBrCTCK2UKlONNSaysSi3Kh0lJc7AoifNqar3zExJITyxJzU5NLUgtgsnKcHAoSfCebgJq\r
+       FCxKTU+tSMvMKUFIM3FwggznARq+B6SGt7ggMbc4Mx0if4pRUUqcdxVIQgAkkVGaB9cLSzyv\r
+       GMWBXhHm3QtSxQNMWnDdr4AGMwENLkvhAxlckoiQkmpgLNd/xLf/4OpDzz4d8E3+xhPQefgF\r
+       p/lEx+ba9eE1YasfVJzO9jaf57v38Pb4qJ1X5pdofLhW8WmaWsSl3p3MdXVs77ODXVTsV809\r
+       svdBvFOxn8DmjMbVmWUiGwtCzXrtv0xXyzet1tn1ZKVf+hw+qwc7l4gd0Fjjtn9a7c+lC597\r
+       GYbLzd+TocRSnJFoqMVcVJwIADfrOYgXAwAA\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 13 Jan 2012 19:18:19 -0000\r
+\r
+LGTM.\r
+\r
+Quoth Tomi Ollila on Jan 13 at 10:17 am:\r
+> emacsclient --eval '(kill-emacs)' makes emacs versions 23.1\r
+> and 23.2 ask user input from running emacs. Redefining\r
+> yes-or-no-p function when kill-emacs is executed for these\r
+> emacs versions in test-lib.el avoids this test problem.\r
+> ---\r
+> Thanks Austin for your comments. Including 'activate' into defadvice\r
+> made it possible to use if (well, without progn...) instead of when\r
+> which makes this also marginally faster (as we're not byte-compiling\r
+> this).\r
+> \r
+>  test/test-lib.el |    7 +++++++\r
+>  1 files changed, 7 insertions(+), 0 deletions(-)\r
+> \r
+> diff --git a/test/test-lib.el b/test/test-lib.el\r
+> index 3b817c3..59c5868 100644\r
+> --- a/test/test-lib.el\r
+> +++ b/test/test-lib.el\r
+> @@ -26,6 +26,13 @@\r
+>  ;; `read' call.\r
+>  (setq read-file-name-function (lambda (&rest _) (read)))\r
+>  \r
+> +;; Work around a bug in emacs 23.1 and emacs 23.2 which prevents\r
+> +;; noninteractive (kill-emacs) from emacsclient.\r
+> +(if (and (= emacs-major-version 23) (< emacs-minor-version 3))\r
+> +  (defadvice kill-emacs (before disable-yes-or-no-p activate)\r
+> +    "Disable yes-or-no-p before executing kill-emacs"\r
+> +    (defun yes-or-no-p (prompt) t)))\r
+> +\r
+>  (defun notmuch-test-wait ()\r
+>    "Wait for process completion."\r
+>    (while (get-buffer-process (current-buffer))\r