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

diff --git a/57/dd9e98797dddab58e48dd8e2fb8a8b6de09b99 b/57/dd9e98797dddab58e48dd8e2fb8a8b6de09b99
new file mode 100644 (file)
index 0000000..055788b
--- /dev/null
+++ b/57/dd9e98797dddab58e48dd8e2fb8a8b6de09b99
@@ -0,0 +1,116 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 243D3431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jul 2012 10:02:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 NQ5obUly7ziz for <notmuch@notmuchmail.org>;\r
+       Sat, 28 Jul 2012 10:01:59 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 4E5ED431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jul 2012 10:01:59 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SvAOp-000195-Ka; Sat, 28 Jul 2012 18:01:55 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SvAOp-0005CQ-AZ; Sat, 28 Jul 2012 18:01:55 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/5] emacs: make notmuch-show return its buffer\r
+In-Reply-To: <1343164911-31589-3-git-send-email-markwalters1009@gmail.com>\r
+References: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com>\r
+       <1343164911-31589-3-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.13.2+93~gf33b188 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 28 Jul 2012 18:01:49 +0100\r
+Message-ID: <87ipd7vmyq.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 5415b7a046be7f9ba70630b11d927240 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sat, 28 Jul 2012 17:02:00 -0000\r
+\r
+\r
+Hi\r
+\r
+I have a version 2 of the rest of this series. However, it obviously\r
+conflicts with the two patches I submitted today splitting out the\r
+async-json parser and the clean-author function. Hence I will see how\r
+they are received before submitting version 2. \r
+\r
+I will mark Patches 3-5 obsolete (and have already marked 1 obsolete as\r
+Tomi had a much better way of doing it). However Patch 2/5 will be needed in\r
+any case so review/approval for this one-line patch would be great!\r
+\r
+Many thanks\r
+\r
+Mark\r
+\r
+\r
+On Tue, 24 Jul 2012, Mark Walters <markwalters1009@gmail.com> wrote:\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