From df8ed27967f1b06633b7e2abe9ea4bd608443a00 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 8 Aug 2012 09:01:10 +0300 Subject: [PATCH] Re: [PATCH v2] emacs: notmuch search bugfix --- 28/fc62ea72d40a381f077be1e2af7ca3de24e9b4 | 144 ++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 28/fc62ea72d40a381f077be1e2af7ca3de24e9b4 diff --git a/28/fc62ea72d40a381f077be1e2af7ca3de24e9b4 b/28/fc62ea72d40a381f077be1e2af7ca3de24e9b4 new file mode 100644 index 000000000..f2e775a94 --- /dev/null +++ b/28/fc62ea72d40a381f077be1e2af7ca3de24e9b4 @@ -0,0 +1,144 @@ +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 1BDFB431FAF + for ; Tue, 7 Aug 2012 23:01:03 -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 Y9hjm8OcUOjE for ; + Tue, 7 Aug 2012 23:01:01 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id A83AF431FAE + for ; Tue, 7 Aug 2012 23:01:01 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 4A5951002A4; Wed, 8 Aug 2012 09:01:10 +0300 (EEST) +From: Tomi Ollila +To: Mark Walters , + Austin Clements +Subject: Re: [PATCH v2] emacs: notmuch search bugfix +In-Reply-To: <877gta1x4d.fsf@qmul.ac.uk> +References: <87boinpqfg.fsf@qmul.ac.uk> <20120806234732.GM22601@mit.edu> + <87pq72bthc.fsf@qmul.ac.uk> <20120807160352.GA2811@mit.edu> + <877gta1x4d.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: Wed, 08 Aug 2012 06:01:03 -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). +> --- + +LGTM. + +Tomi + +> +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2