[PATCH 3/3] emacs: make notmuch-show return its buffer

diff --git a/93/88784a570f1465af3df992f2c5d40b74109736 b/93/88784a570f1465af3df992f2c5d40b74109736
new file mode 100644 (file)
index 0000000..4a95920
--- /dev/null
+++ b/93/88784a570f1465af3df992f2c5d40b74109736
@@ -0,0 +1,85 @@
+Return-Path: <markwalters1009@gmail.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 236A1421169\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 sjVLst5SXE7O for <notmuch@notmuchmail.org>;\r
+       Wed, 11 Jul 2012 11:57:28 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9858C42116C\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:26 -0700 (PDT)\r
+Received: by mail-we0-f181.google.com with SMTP id t57so1096499wey.26\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:26 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=GBZc1PVLkSAFnQJw8vjXvCTjtP2pzqEtOC/uvMAH+5I=;\r
+       b=XHyT9qGaYuUc8yoTN0VYbJe5bSikS+6cNra3V9uY/TMq32IXkEJqPiUy6zIys6MO+j\r
+       6/nNaLGMB4jdBPBG+zf3xBwvigpW4o3Ih3bBqWDUg+bCWD4x7PXwsmNIK+aMgn2bUHxu\r
+       D9K1T7V8AjdHiW7Kufv6Z8Sja6G4LZ6yeVUIvxpsx3vBy5eYWFeGesvedbLeQ7ePemaB\r
+       xBro83oiBhYWznTjDjpBkz+0gv3QyNOQeC5xtzpSMSMko7Q3l/vbQczW0sLv2UaYsvbS\r
+       lHPNp60awv2K1nZT7hKtIDSWDeJ6VQbrZKiOnfu285gRc5MqVMu9DfjYuah7RJH5/Yp6\r
+       1hKQ==\r
+Received: by 10.180.78.99 with SMTP id a3mr49304484wix.15.1342033046279;\r
+       Wed, 11 Jul 2012 11:57:26 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ cl8sm35768355wib.10.2012.07.11.11.57.24       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 11 Jul 2012 11:57:25 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] emacs: make notmuch-show return its buffer\r
+Date: Wed, 11 Jul 2012 19:57:07 +0100\r
+Message-Id: <1342033027-30286-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1342033027-30286-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1342033027-30286-1-git-send-email-markwalters1009@gmail.com>\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 Jul 2012 18:57:30 -0000\r
+\r
+notmuch-pick uses the returned buffer to try and make sure it does not\r
+close the wrong buffer.\r
+---\r
+ emacs/notmuch-show.el |    3 ++-\r
+ 1 files changed, 2 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 6335d45..1cabd17 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1031,7 +1031,8 @@ function is used."\r
+         notmuch-show-parent-buffer parent-buffer\r
+         notmuch-show-query-context query-context)\r
+     (notmuch-show-build-buffer)\r
+-    (notmuch-show-goto-first-wanted-message)))\r
++    (notmuch-show-goto-first-wanted-message)\r
++    (current-buffer)))\r
+ \r
+ (defun notmuch-show-build-buffer ()\r
+   (let ((inhibit-read-only t))\r
+-- \r
+1.7.9.1\r
+\r