X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=edb5a1c70dc709ada7f09a6c57da237c3a254b93;hp=af107e28f3aa01b8df3f08da431e777002521bd5;hb=63782f4023680dd08c88024b50e5e48dfa3f50cd;hpb=9de0639126091fa0e48cfde69e3f6044d167a76a

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index af107e28..edb5a1c7 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -904,9 +904,8 @@ Other optional parameters are used as follows:
   target-line: The line number to move to if the target thread does not
                appear in the search results."
   (interactive)
-  (if (null query)
-      (setq query (notmuch-read-query "Notmuch search: ")))
-  (let ((buffer (get-buffer-create (notmuch-search-buffer-title query))))
+  (let* ((query (or query (notmuch-read-query "Notmuch search: ")))
+	 (buffer (get-buffer-create (notmuch-search-buffer-title query))))
     (switch-to-buffer buffer)
     (notmuch-search-mode)
     ;; Don't track undo information for this buffer