X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=46f14fea1dd0ff112a57e64154cc5e5eeb19ab37;hp=9c7f2020bdb9ab0cde0908d8ac84d01f19a50412;hb=001256ab2916ab809b75ea8aa4bc363bf81a4174;hpb=4c822aecc75bd6f7cdffc80b704b27dde8e27ea6

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 9c7f2020..46f14fea 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -931,8 +931,8 @@ PROMPT is the string to prompt with."
   "Return the current query in this search buffer"
   notmuch-search-query-string)
 
-;;;###autoload
 (put 'notmuch-search 'notmuch-doc "Search for messages.")
+;;;###autoload
 (defun notmuch-search (&optional query oldest-first target-thread target-line)
   "Display threads matching QUERY in a notmuch-search buffer.
 
@@ -1058,8 +1058,9 @@ current search results AND that are tagged with the given tag."
   (with-current-buffer b
     (memq major-mode '(notmuch-show-mode
 		       notmuch-search-mode
+		       notmuch-tree-mode
 		       notmuch-hello-mode
-		       message-mode))))
+		       notmuch-message-mode))))
 
 ;;;###autoload
 (defun notmuch-cycle-notmuch-buffers ()