diff options
| author | Mark Walters <markwalters1009@gmail.com> | 2012-06-16 11:21:46 +0100 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-06-29 22:33:31 -0300 |
| commit | e12645c869a1c34aa28239465e1fe8321d182709 (patch) | |
| tree | 69a5c3095ae855f3ca6155cea9af5ba75d7642db | |
| parent | fdce20d365d58491bd82a5944915843972fc0f00 (diff) | |
emacs: make elide messages use notmuch-show for omitting messages.
Previously the elide messages code got the entire-thread from
notmuch-show.c and then threw away all non-matching messages. This
version calls notmuch-show.c without the --entire-thread flag so
it never receives the non-matching messages in the first place.
This makes it substantially faster.
| -rw-r--r-- | emacs/notmuch-show.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 4349836..6335d45 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -964,9 +964,9 @@ message at DEPTH in the current thread." "Insert the message tree TREE at depth DEPTH in the current thread." (let ((msg (car tree)) (replies (cadr tree))) - (if (or (not notmuch-show-elide-non-matching-messages) - (plist-get msg :match)) - (notmuch-show-insert-msg msg depth)) + ;; We test whether there is a message or just some replies. + (when msg + (notmuch-show-insert-msg msg depth)) (notmuch-show-insert-thread replies (1+ depth)))) (defun notmuch-show-insert-thread (thread depth) @@ -1047,16 +1047,18 @@ function is used." (args (if notmuch-show-query-context (append (list "\'") basic-args (list "and (" notmuch-show-query-context ")\'")) - (append (list "\'") basic-args (list "\'"))))) - (notmuch-show-insert-forest (notmuch-query-get-threads - (cons "--exclude=false" args))) + (append (list "\'") basic-args (list "\'")))) + (cli-args (cons "--exclude=false" + (when notmuch-show-elide-non-matching-messages + (list "--entire-thread=false"))))) + + (notmuch-show-insert-forest (notmuch-query-get-threads (append cli-args args))) ;; If the query context reduced the results to nothing, run ;; the basic query. (when (and (eq (buffer-size) 0) notmuch-show-query-context) (notmuch-show-insert-forest - (notmuch-query-get-threads - (cons "--exclude=false" basic-args))))) + (notmuch-query-get-threads (append cli-args basic-args))))) (jit-lock-register #'notmuch-show-buttonise-links) |