Small bug in json-search changes

diff --git a/d8/b85a61c2bc711f61e0cf9d1f08ec7659171be5 b/d8/b85a61c2bc711f61e0cf9d1f08ec7659171be5
new file mode 100644 (file)
index 0000000..ff5d08c
--- /dev/null
+++ b/d8/b85a61c2bc711f61e0cf9d1f08ec7659171be5
@@ -0,0 +1,106 @@
+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 2E594431FAF\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Aug 2012 16:10:59 -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 Bok1rzUbt86K for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Aug 2012 16:10:57 -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 04E24431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Aug 2012 16:10:56 -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 1SyWRm-0006Ow-IL; Tue, 07 Aug 2012 00:10:52 +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 1SyWRl-0003Du-IX; Tue, 07 Aug 2012 00:10:49 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Small bug in json-search changes\r
+User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 07 Aug 2012 00:10:43 +0100\r
+Message-ID: <87boinpqfg.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: abedaf4e08eafee7200047f8aff39411 (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: Mon, 06 Aug 2012 23:10:59 -0000\r
+\r
+\r
+Hi\r
+\r
+I have found a small bug in the recent changes to notmuch search to use\r
+the JSON output. If you refresh the search buffer "point" does not stay\r
+on the same thread. \r
+\r
+I think the problem is that notmuch-search-refresh-view calls notmuch\r
+search with target-thread set to notmuch-search-find-thread-id which\r
+returns the thread-id with "thread:" prefixed, whereas\r
+notmuch-search-show-result checks for a match with (plist-get result\r
+:thread) which is the thread id with no prefix.\r
+\r
+The patch below fixes this but I am not sure it is the nicest fix.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index d2d82a9..a53d5a0 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -798,7 +798,7 @@ non-authors is found, assume that all of the authors match."\r
+       (insert "\n")\r
+       (notmuch-search-color-line beg (point) (plist-get result :tags))\r
+       (put-text-property beg (point) 'notmuch-search-result result))\r
+-      (when (string= (plist-get result :thread) notmuch-search-target-thread)\r
++      (when (string= (concat "thread:" (plist-get result :thread)) notmuch-search-target-thread)\r
+       (setq notmuch-search-target-thread "found")\r
+       (goto-char beg)))))\r
+ \r
+\r