On Thu, 13 Oct 2016, Matt Armstrong <marmstr...@google.com> wrote:
> notmuch-show--build-buffer now queries a list of queries built by the
> former. This simplifies the logic. It also provides an easy place to
> experiment with alternate sets of queries for given notmuch-show-*
> variables (e.g. users can use advice-add to do so in a surgical way).
This is looking pretty good. I suggest a couple of further changes below.
> emacs/notmuch-show.el | 36 ++++++++++++++++++++++--------------
> 1 file changed, 22 insertions(+), 14 deletions(-)
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index f2487ab..b393c11 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -1261,6 +1261,20 @@ matched."
> (message "No messages matched the query!")
> +(defun notmuch-show--build-queries ()
> + "Return a list of queries to try for this search.
> +If `notmuch-show-query-context` is not nil, the first query is
> +the conjunction of it and `notmuch-show-thread-id`. The next
> +query is `notmuch-show-thread-id` alone, and serves as a fallback
> +if the prior matches no messages."
> + (let* ((thread notmuch-show-thread-id)
> + (context notmuch-show-query-context)
> + queries)
> + (push (list thread) queries)
> + (if context (push (list thread "and (" context ")") queries))
> + queries))
We may want to call this from tree-mode later, so I wonder whether
passing it notmuch-show-thread-id and notmuch-show-query-context as
arguments would make sense. I quite like the idea of this function being
self contained (ie not referencing global state variables). My instinct
is that referencing truly global variables like customise variables is
fine, but I am less keen on referencing buffer-local global variables.
However, some of this depends on what your later plans are.
> (defun notmuch-show--build-buffer (&optional state)
> "Display messages matching the current buffer context.
> @@ -1268,25 +1282,19 @@ Apply the previously saved STATE if supplied,
> otherwise show the
> first relevant message.
> If no messages match the query return NIL."
> - (let* ((basic-args (list notmuch-show-thread-id))
> - (args (if notmuch-show-query-context
> - (append (list "\'") basic-args
> - (list "and (" notmuch-show-query-context ")\'"))
> - (append (list "\'") basic-args (list "\'"))))
> - (cli-args (cons "--exclude=false"
> + (let* ((cli-args (cons "--exclude=false"
> (when notmuch-show-elide-non-matching-messages
> (list "--entire-thread=false"))))
> - (forest (or (notmuch-query-get-threads (append cli-args args))
> - ;; If a query context reduced the number of
> - ;; results to zero, try again without it.
> - (and notmuch-show-query-context
> - (notmuch-query-get-threads (append cli-args
> + (queries (notmuch-show--build-queries))
> + (forest nil)
> ;; Must be reset every time we are going to start inserting
> ;; messages into the buffer.
> (notmuch-show-previous-subject ""))
> + ;; Use results from the first query that returns some.
> + (while (and (not forest) (consp queries))
> + (setq forest (notmuch-query-get-threads
> + (append cli-args (list "'") (car queries) (list "'"))))
> + (setq queries (cdr queries)))
One small style point: you can replace the (consp queries) test just
with queries: the empty list equals "nil".
> (when forest
> (notmuch-show-insert-forest forest)
> notmuch mailing list
notmuch mailing list