From 1a2e5ec030c5aa0cb64839c15bab96ca6f9c20c5 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 7 Aug 2012 16:40:47 +0100 Subject: [PATCH] [PATCH] emacs: notmuch search bugfix --- 49/51c1943d3062f29a7f4dd6f3581eada74a32ba | 141 ++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 49/51c1943d3062f29a7f4dd6f3581eada74a32ba diff --git a/49/51c1943d3062f29a7f4dd6f3581eada74a32ba b/49/51c1943d3062f29a7f4dd6f3581eada74a32ba new file mode 100644 index 000000000..8289ac920 --- /dev/null +++ b/49/51c1943d3062f29a7f4dd6f3581eada74a32ba @@ -0,0 +1,141 @@ +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 7158E431FC0 + for ; Tue, 7 Aug 2012 08:40:57 -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 MGyfL39kdMS7 for ; + Tue, 7 Aug 2012 08:40:56 -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 94401431FAF + for ; Tue, 7 Aug 2012 08:40:56 -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 1Syltt-0007JG-Ts; Tue, 07 Aug 2012 16:40:54 +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 1Syltt-0000aN-LY; Tue, 07 Aug 2012 16:40:53 +0100 +From: Mark Walters +To: Austin Clements +Subject: [PATCH] emacs: notmuch search bugfix +In-Reply-To: <20120806234732.GM22601@mit.edu> +References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@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 16:40:47 +0100 +Message-ID: <87pq72bthc.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: 1e1196dd921c0e929751264597c710e7 (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 15:40:57 -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). +--- + +This is a different version of the bugfix suggested in the parent to +this thread. I think it is nicer but there is a slight risk of breaking +users .emacs lisp functions. + +In general I think the thread: prefix should be present where the term +is "really" a search term, but absent when it is must be a thread-id, +and this fits with that idea. + +With 0.14 freeze pretty close it might be best to apply this to master +and the simpler no breakage option (in id:"87boinpqfg.fsf@qmul.ac.uk") +to the branch. + +Best wishes + +Mark + + emacs/notmuch.el | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index d2d82a9..0fff58a 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 (when (not bare) "thread:") thread)))) + + (defun notmuch-search-find-thread-id-region (beg end) + "Return a list of threads for the current region" +@@ -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 t)) + (query notmuch-search-query-string) + (continuation notmuch-search-continuation)) + (notmuch-kill-this-buffer) +-- +1.7.9.1 + -- 2.26.2