X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=9939027700952c0f5255700cc9be5a274ae4f99b;hp=dd423765d7139cc2004c5a3b03c6989cdca57ff1;hb=43668950626f347f05aad7d49cd9ea4383030443;hpb=949c27144e0b9294267511993a109c29d319a23d

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index dd423765..99390277 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1269,7 +1269,9 @@ matched."
     ;; aren't wiped out.
     (setq notmuch-show-thread-id thread-id
 	  notmuch-show-parent-buffer parent-buffer
-	  notmuch-show-query-context query-context
+	  notmuch-show-query-context (if (or (string= query-context "")
+					     (string= query-context "*"))
+					 nil query-context)
 
 	  notmuch-show-process-crypto notmuch-crypto-process-mime
 	  ;; If `elide-toggle', invert the default value.