--- /dev/null
+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 77AE5431FC0\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:32:27 -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 LOsJSv3rGRRL for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Aug 2012 09:32:27 -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 BE193431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:32:26 -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 1Symhl-000445-0b; Tue, 07 Aug 2012 17:32:25 +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 1Symhk-0004QT-Nf; Tue, 07 Aug 2012 17:32:24 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>\r
+Subject: [PATCH v2] emacs: notmuch search bugfix\r
+In-Reply-To: <20120807160352.GA2811@mit.edu>\r
+References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu>\r
+ <87pq72bthc.fsf@qmul.ac.uk> <20120807160352.GA2811@mit.edu>\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 17:32:18 +0100\r
+Message-ID: <877gta1x4d.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: 5a34d4ccae813180489b98ef05114659 (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
+Cc: notmuch@notmuchmail.org\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, 07 Aug 2012 16:32:27 -0000\r
+\r
+\r
+The recent change to use json for notmuch-search.el introduced a bug\r
+in the code for keeping position on refresh. The problem is a\r
+comparison between (plist-get result :thread) and a thread-id returned\r
+by notmuch-search-find-thread-id: the latter is prefixed with\r
+"thread:"\r
+\r
+We fix this by adding an option to notmuch-search-find-thread-id to\r
+return the bare thread-id. It appears that notmuch-search-refresh-view\r
+is the only caller of notmuch-search that supplies a thread-id so this\r
+change should be safe (but could theoretically break users .emacs\r
+functions).\r
+---\r
+\r
+I think this implements all of Austin's suggestions, and it adds a short\r
+remark to NEWS (since in unlikely cases it could break users' functions)\r
+and updates the docstring for notmuch-search. \r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+ NEWS | 3 +++\r
+ emacs/notmuch.el | 12 +++++++-----\r
+ 2 files changed, 10 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 761b2c1..9916c91 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -55,6 +55,9 @@ user-specified formatting\r
+ you've customized this variable, you may have to change your date\r
+ format from `"%s "` to `"%12s "`.\r
+ \r
++The thread-id for the `target-thread` argument for `notmuch-search` should\r
++now be supplied without the "thread:" prefix.\r
++\r
+ Notmuch 0.13.2 (2012-06-02)\r
+ ===========================\r
+ \r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index d2d82a9..7b61e9b 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -475,10 +475,12 @@ BEG."\r
+ (push (plist-get (notmuch-search-get-result pos) property) output)))\r
+ output))\r
+ \r
+-(defun notmuch-search-find-thread-id ()\r
+- "Return the thread for the current thread"\r
++(defun notmuch-search-find-thread-id (&optional bare)\r
++ "Return the thread for the current thread\r
++\r
++If BARE is set then do not prefix with \"thread:\""\r
+ (let ((thread (plist-get (notmuch-search-get-result) :thread)))\r
+- (when thread (concat "thread:" thread))))\r
++ (when thread (concat (unless bare "thread:") thread))))\r
+ \r
+ (defun notmuch-search-find-thread-id-region (beg end)\r
+ "Return a list of threads for the current region"\r
+@@ -936,7 +938,7 @@ If `query' is nil, it is read interactively from the minibuffer.\r
+ Other optional parameters are used as follows:\r
+ \r
+ oldest-first: A Boolean controlling the sort order of returned threads\r
+- target-thread: A thread ID (with the thread: prefix) that will be made\r
++ target-thread: A thread ID (without the thread: prefix) that will be made\r
+ current if it appears in the search results.\r
+ target-line: The line number to move to if the target thread does not\r
+ appear in the search results."\r
+@@ -993,7 +995,7 @@ same relative position within the new buffer."\r
+ (interactive)\r
+ (let ((target-line (line-number-at-pos))\r
+ (oldest-first notmuch-search-oldest-first)\r
+- (target-thread (notmuch-search-find-thread-id))\r
++ (target-thread (notmuch-search-find-thread-id 'bare))\r
+ (query notmuch-search-query-string)\r
+ (continuation notmuch-search-continuation))\r
+ (notmuch-kill-this-buffer)\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff