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

diff --git a/33/39a45696f9086a0822230e14a43d248da9a43f b/33/39a45696f9086a0822230e14a43d248da9a43f
new file mode 100644 (file)
index 0000000..3ed2a33
--- /dev/null
+++ b/33/39a45696f9086a0822230e14a43d248da9a43f
@@ -0,0 +1,101 @@
+Return-Path: <too@nixu.com>\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 4B7BD429E21\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 06:50:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 HeKxkEeO9uhv for <notmuch@notmuchmail.org>;\r
+       Wed, 11 Jan 2012 06:50:01 -0800 (PST)\r
+Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6011C431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 06:50:01 -0800 (PST)\r
+Received: from pps.filterd (mail-gw3 [127.0.0.1])\r
+       by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id q0BEnlUm030148;\r
+       Wed, 11 Jan 2012 16:49:47 +0200\r
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])\r
+       by mail-gw3.nixu.fi with ESMTP id 114cs0yvd2-1\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Wed, 11 Jan 2012 16:49:47 +0200\r
+Received: from taco2.nixu.fi (localhost [127.0.0.1])\r
+       by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id\r
+       q0BEnkfb025293\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);\r
+       Wed, 11 Jan 2012 16:49:46 +0200\r
+Received: (from too@localhost)\r
+       by taco2.nixu.fi (8.14.3/8.14.3/Submit) id q0BEnkiL025292;\r
+       Wed, 11 Jan 2012 16:49:46 +0200\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] make (kill-emacs) from emacsclient work with emacs 23.(1|2)\r
+Date: Wed, 11 Jan 2012 16:49:38 +0200\r
+Message-Id: <1326293378-25248-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <87d3b01qus.fsf@qmul.ac.uk>\r
+References: <87d3b01qus.fsf@qmul.ac.uk>\r
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,\r
+ 1.0.211,      0.0.0000        definitions=2012-01-11_03:2012-01-11, 2012-01-11,\r
+       1970-01-01 signatures=0\r
+X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0\r
+       ipscore=0 suspectscore=1\r
+       phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0\r
+       reason=mlx\r
+       scancount=1 engine=6.0.2-1012030000 definitions=main-1201110112\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Wed, 11 Jan 2012 14:50:03 -0000\r
+\r
+emacsclient --eval '(kill-emacs)' doesn't work without interactive\r
+user input. By removing the hook which asks user input makes things\r
+work well enough in our test cases.\r
+---\r
+ test/test-lib.el |   13 +++++++++++++\r
+ 1 files changed, 13 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 3b817c3..c52854e 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -26,6 +26,19 @@\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
++(when (and (= emacs-major-version 23) (< emacs-minor-version 3))\r
++  (require 'server)\r
++  (fset 'server-start-real (symbol-function 'server-start))\r
++  (defun server-start (&optional leave-dead)\r
++    (interactive "P")\r
++    (let ((hc (length kill-emacs-hook)))\r
++      (unwind-protect\r
++        (server-start-real leave-dead)\r
++      (if (> (length kill-emacs-hook) hc)\r
++          (setq kill-emacs-hook (cdr kill-emacs-hook)))))))\r
++\r
+ (defun notmuch-test-wait ()\r
+   "Wait for process completion."\r
+   (while (get-buffer-process (current-buffer))\r
+-- \r
+1.7.7.3\r
+\r