X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=0954d87639813cbd0236ee1ce7b9847bd8703d3b;hb=5500868bd96f9461a230d16839591cb7ebc035df;hp=203ca7f07bfa3e099a0d2dc54031c9937685dff8;hpb=66369ddf1cd1d7f84a048095ee5dcf5cb07e110c;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 203ca7f0..0954d876 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -32,7 +32,6 @@
 
 (require 'notmuch-lib)
 (require 'notmuch-tag)
-(require 'notmuch-query)
 (require 'notmuch-wash)
 (require 'notmuch-mua)
 (require 'notmuch-crypto)
@@ -1366,7 +1365,7 @@ If no messages match the query return NIL."
 	 (notmuch-show-previous-subject ""))
     ;; Use results from the first query that returns some.
     (while (and (not forest) queries)
-      (setq forest (notmuch-query-get-threads
+      (setq forest (notmuch--run-show
 		    (append cli-args (list "'") (car queries) (list "'"))))
       (when (and forest notmuch-show-single-message)
 	(setq forest (list (list (list forest)))))
@@ -2227,7 +2226,9 @@ argument, hide all of the messages."
 If SHOW is non-nil, open the next item in a show
 buffer. Otherwise just highlight the next item in the search
 buffer. If PREVIOUS is non-nil, move to the previous item in the
-search results instead."
+search results instead.
+
+Return non-nil on success."
   (interactive "P")
   (let ((parent-buffer notmuch-show-parent-buffer))
     (notmuch-bury-or-kill-this-buffer)