[RFC PATCH v3 09/11] emacs: make notmuch-show return its buffer

diff --git a/f9/cfac3c57ee158f6b61d33b5e90e91fa376a18b b/f9/cfac3c57ee158f6b61d33b5e90e91fa376a18b
new file mode 100644 (file)
index 0000000..730a5be
--- /dev/null
+++ b/f9/cfac3c57ee158f6b61d33b5e90e91fa376a18b
@@ -0,0 +1,82 @@
+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 8C872429E5B\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:20:07 -0800 (PST)\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 WFi0bRZf4Z71 for <notmuch@notmuchmail.org>;\r
+       Sun, 12 Feb 2012 17:20:06 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ A975441ED83   for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:32 -0800\r
+ (PST)\r
+Received: by mail-ww0-f45.google.com with SMTP id dt12so3923384wgb.2\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:32 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=W4Fab4EQaJjjhsFtFXzc/YfZvjj+K88DRcNt//OZfxw=;\r
+       b=FoliJ2WFrC+ZQsT0ftzqtQH5GkID9t7OALIl2HdX745JQPexAf1kvoEY2vdrTavijn\r
+       9T7OP+BPmtRv8dhqE4GOGTcwc6lqMuPMt9kOwRJQLJikBznyzpzkjNqJpW3aXRW1hAt8\r
+       rASqcAY47907k7IYTqFY++/SEXRizh0pILblQ=\r
+Received: by 10.180.101.200 with SMTP id fi8mr21162785wib.20.1329095972430;\r
+       Sun, 12 Feb 2012 17:19:32 -0800 (PST)\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
+ dw7sm18425321wib.4.2012.02.12.17.19.31        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 12 Feb 2012 17:19:31 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH v3 09/11] emacs: make notmuch-show return its buffer\r
+Date: Mon, 13 Feb 2012 01:20:13 +0000\r
+Message-Id: <1329096015-8078-10-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1329072579-27340-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: Mon, 13 Feb 2012 01:20:08 -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 244e18d..8a8acf6 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1048,7 +1048,8 @@ function is used."\r
+     (setq notmuch-show-thread-id thread-id\r
+         notmuch-show-parent-buffer parent-buffer\r
+         notmuch-show-query-context query-context)\r
+-    (notmuch-show-worker)))\r
++    (notmuch-show-worker)\r
++    (current-buffer)))\r
+ \r
+ (defun notmuch-show-worker ()\r
+   (let ((inhibit-read-only t))\r
+-- \r
+1.7.2.3\r
+\r