emacs/search: call notmuch-search-mode before popping to buffer

This makes derived-mode matching in display-buffer-alist work.

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 29b2a9ed1bc005b1589b13d3067892150d80a729..69aff3475508e6c518b2f3fbec10e93eaf7d883a 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -1091,10 +1091,10 @@ the configured default sort order."
 
   (let* ((query (or query (notmuch-read-query "Notmuch search: ")))
         (buffer (get-buffer-create (notmuch-search-buffer-title query))))
-    (if no-display
-       (set-buffer buffer)
-      (pop-to-buffer-same-window buffer))
+    (set-buffer buffer)
     (notmuch-search-mode)
+    (unless no-display
+      (pop-to-buffer-same-window buffer))
     ;; Don't track undo information for this buffer
     (setq buffer-undo-list t)
     (setq notmuch-search-query-string query)