[PATCH] emacs: notmuch search bugfix

[Austin Clements]

Quoth Mark Walters on Aug 07 at  4:40 pm:
> 
> 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.

Agreed.

> 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 at 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))))

(unless bare "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))

Perhaps pass 'bare instead of t to make this self-documenting?

>  	(query notmuch-search-query-string)
>  	(continuation notmuch-search-continuation))
>      (notmuch-kill-this-buffer)