From: Tomi Ollila Date: Tue, 7 Aug 2012 16:09:05 +0000 (+0300) Subject: Re: [PATCH] emacs: notmuch search bugfix X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c5a551677fccb2be366746be9a2737aba7922f88;p=notmuch-archives.git Re: [PATCH] emacs: notmuch search bugfix --- diff --git a/34/62967955fc0c000c2b1caf0da77709a529a2b9 b/34/62967955fc0c000c2b1caf0da77709a529a2b9 new file mode 100644 index 000000000..4ea49b554 --- /dev/null +++ b/34/62967955fc0c000c2b1caf0da77709a529a2b9 @@ -0,0 +1,138 @@ +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 AB409431FC0 + for ; Tue, 7 Aug 2012 09:08:57 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 qRljlw5DCpLR for ; + Tue, 7 Aug 2012 09:08:57 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id EF63F431FAF + for ; Tue, 7 Aug 2012 09:08:56 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id A474E1002A4; Tue, 7 Aug 2012 19:09:05 +0300 (EEST) +From: Tomi Ollila +To: Mark Walters , + Austin Clements +Subject: Re: [PATCH] emacs: notmuch search bugfix +In-Reply-To: <87pq72bthc.fsf@qmul.ac.uk> +References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu> + <87pq72bthc.fsf@qmul.ac.uk> +User-Agent: Notmuch/0.13.2+128~g07453d8 (http://notmuchmail.org) Emacs/23.1.1 + (x86_64-redhat-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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:08:57 -0000 + +On Tue, Aug 07 2012, Mark Walters wrote: + +> 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. + +LGTM. + +IMHO you're too shy with this patch to be included in 0.14 :D +-- at least I cannot imagine a case this would fail... + +My change would have been: + (when thread (if bare thread (concat "thread:" thread))) + +or even (which changes irrelevant part): + (if thread (if bare thread (concat "thread:" thread))) + +Anyway, this is good as it is "in the grand scheme of things". + +Tomi + +> +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch