X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=cd901e47193058429a842bd8b4260e9da18e8e0c;hb=46bda291ba6b73266f6e48a539af7772a4d09edf;hp=1cbcc132030a67c347938b943d70beb2fd67a59e;hpb=b6f87c3085e25e5bf65a4f956af8846bc0681c52;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 1cbcc132..cd901e47 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1260,7 +1260,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.