From: Mark Walters Date: Tue, 7 Aug 2012 16:32:18 +0000 (+0100) Subject: [PATCH v2] emacs: notmuch search bugfix X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=73212f6135c96441cca4871006fea2ac0cab6f74;p=notmuch-archives.git [PATCH v2] emacs: notmuch search bugfix --- diff --git a/3a/d449f049fb67b21fa481c8e43183630f8ffea8 b/3a/d449f049fb67b21fa481c8e43183630f8ffea8 new file mode 100644 index 000000000..237fb3d8a --- /dev/null +++ b/3a/d449f049fb67b21fa481c8e43183630f8ffea8 @@ -0,0 +1,158 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 77AE5431FC0 + for ; Tue, 7 Aug 2012 09:32:27 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id LOsJSv3rGRRL for ; + Tue, 7 Aug 2012 09:32:27 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id BE193431FAF + for ; Tue, 7 Aug 2012 09:32:26 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Symhl-000445-0b; Tue, 07 Aug 2012 17:32:25 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Symhk-0004QT-Nf; Tue, 07 Aug 2012 17:32:24 +0100 +From: Mark Walters +To: Austin Clements +Subject: [PATCH v2] emacs: notmuch search bugfix +In-Reply-To: <20120807160352.GA2811@mit.edu> +References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu> + <87pq72bthc.fsf@qmul.ac.uk> <20120807160352.GA2811@mit.edu> +User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 07 Aug 2012 17:32:18 +0100 +Message-ID: <877gta1x4d.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 5a34d4ccae813180489b98ef05114659 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 07 Aug 2012 16:32:27 -0000 + + +The recent change to use json for notmuch-search.el introduced a bug +in the code for keeping position on refresh. The problem is a +comparison between (plist-get result :thread) and a thread-id returned +by notmuch-search-find-thread-id: the latter is prefixed with +"thread:" + +We fix this by adding an option to notmuch-search-find-thread-id to +return the bare thread-id. It appears that notmuch-search-refresh-view +is the only caller of notmuch-search that supplies a thread-id so this +change should be safe (but could theoretically break users .emacs +functions). +--- + +I think this implements all of Austin's suggestions, and it adds a short +remark to NEWS (since in unlikely cases it could break users' functions) +and updates the docstring for notmuch-search. + +Best wishes + +Mark + + NEWS | 3 +++ + emacs/notmuch.el | 12 +++++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/NEWS b/NEWS +index 761b2c1..9916c91 100644 +--- a/NEWS ++++ b/NEWS +@@ -55,6 +55,9 @@ user-specified formatting + you've customized this variable, you may have to change your date + format from `"%s "` to `"%12s "`. + ++The thread-id for the `target-thread` argument for `notmuch-search` should ++now be supplied without the "thread:" prefix. ++ + Notmuch 0.13.2 (2012-06-02) + =========================== + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index d2d82a9..7b61e9b 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -475,10 +475,12 @@ BEG." + (push (plist-get (notmuch-search-get-result pos) property) output))) + output)) + +-(defun notmuch-search-find-thread-id () +- "Return the thread for the current thread" ++(defun notmuch-search-find-thread-id (&optional bare) ++ "Return the thread for the current thread ++ ++If BARE is set then do not prefix with \"thread:\"" + (let ((thread (plist-get (notmuch-search-get-result) :thread))) +- (when thread (concat "thread:" thread)))) ++ (when thread (concat (unless bare "thread:") thread)))) + + (defun notmuch-search-find-thread-id-region (beg end) + "Return a list of threads for the current region" +@@ -936,7 +938,7 @@ If `query' is nil, it is read interactively from the minibuffer. + Other optional parameters are used as follows: + + oldest-first: A Boolean controlling the sort order of returned threads +- target-thread: A thread ID (with the thread: prefix) that will be made ++ target-thread: A thread ID (without the thread: prefix) that will be made + current if it appears in the search results. + target-line: The line number to move to if the target thread does not + appear in the search results." +@@ -993,7 +995,7 @@ same relative position within the new buffer." + (interactive) + (let ((target-line (line-number-at-pos)) + (oldest-first notmuch-search-oldest-first) +- (target-thread (notmuch-search-find-thread-id)) ++ (target-thread (notmuch-search-find-thread-id 'bare)) + (query notmuch-search-query-string) + (continuation notmuch-search-continuation)) + (notmuch-kill-this-buffer) +-- +1.7.9.1 +