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

diff --git a/3c/3110ca33c1d7d67c1befdc0f8517a374fd11da b/3c/3110ca33c1d7d67c1befdc0f8517a374fd11da
new file mode 100644 (file)
index 0000000..cc1c95c
--- /dev/null
+++ b/3c/3110ca33c1d7d67c1befdc0f8517a374fd11da
@@ -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 3ABD6431FC4\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:03 -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 BvEH8-pd5tNe for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 14:22:02 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9A92A431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:02 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hq4so19767wib.2\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:02 -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=L+bG8fz7Wp/n2Ab94u+CO15k6UB5cwFNg/9Kq06/tz6hXSl7tuzZG8wYMvEr31r7KA\r
+       IrGK5uopt/kMJ7EMY3Xz4YCL35OQq0zNorTphzJrCN9L3+7aTVy2ANzHBI7c5rxgr7+n\r
+       31qUlKOMxi9JmdS3XAIWzlXBj8yM9xpAdxHDt9ivlxMA9jEIRfVXa1Mspk0m1cq2mjZw\r
+       VcJ/CLxZh6lhgKLGhr/D8D1pBFmgZtfxHLfTTAq4jTznUJPYosCoXOvfNu8ZpqlCi2qX\r
+       uu509N1LL6j1o8MtlV6j8nu/ZkzuXMPnr+PNjVx0749cReBBXvRS+J0L/SSQtofsS1Il\r
+       ixcw==\r
+Received: by 10.217.1.195 with SMTP id n45mr5855415wes.179.1343164922256;\r
+       Tue, 24 Jul 2012 14:22:02 -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
+ t7sm9671120wix.6.2012.07.24.14.22.00  (version=TLSv1/SSLv3 cipher=OTHER);     Tue,\r
+ 24 Jul 2012 14:22:01 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] emacs: make notmuch-show return its buffer\r
+Date: Tue, 24 Jul 2012 22:21:48 +0100\r
+Message-Id: <1343164911-31589-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1343164911-31589-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: Tue, 24 Jul 2012 21:22:03 -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