X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-tree.el;h=b498db0723e2aae2126b63ba0268636f89789a4c;hb=a2388bc56e55da5d5695816818274f8a84b0ed92;hp=a5ae0edb1dec98908065379ad77a69cb9921d7be;hpb=09f6533c3781b61ea634790d4bad38aadf89115c;p=notmuch

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index a5ae0edb..b498db07 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -967,19 +967,19 @@ Complete list of currently available key bindings:
 	(never-found-target-thread nil))
     (when (memq status '(exit signal))
       (kill-buffer (process-get proc 'parse-buf))
-      (if (buffer-live-p buffer)
-	  (with-current-buffer buffer
-	    (save-excursion
-	      (let ((inhibit-read-only t)
-		    (atbob (bobp)))
-		(goto-char (point-max))
-		(if (eq status 'signal)
-		    (insert "Incomplete search results (tree view process was killed).\n"))
-		(when (eq status 'exit)
-		  (insert "End of search results.")
-		  (unless (= exit-status 0)
-		    (insert (format " (process returned %d)" exit-status)))
-		  (insert "\n")))))))))
+      (when (buffer-live-p buffer)
+	(with-current-buffer buffer
+	  (save-excursion
+	    (let ((inhibit-read-only t)
+		  (atbob (bobp)))
+	      (goto-char (point-max))
+	      (when (eq status 'signal)
+		(insert "Incomplete search results (tree view process was killed).\n"))
+	      (when (eq status 'exit)
+		(insert "End of search results.")
+		(unless (= exit-status 0)
+		  (insert (format " (process returned %d)" exit-status)))
+		(insert "\n")))))))))
 
 (defun notmuch-tree-process-filter (proc string)
   "Process and filter the output of \"notmuch show\" for tree view."
@@ -1009,7 +1009,8 @@ the same as for the function notmuch-tree."
   (setq notmuch-tree-basic-query basic-query)
   (setq notmuch-tree-query-context (if (or (string= query-context "")
 					   (string= query-context "*"))
-				       nil query-context))
+				       nil
+				     query-context))
   (setq notmuch-tree-target-msg target)
   (setq notmuch-tree-open-target open-target)
   ;; Set the default value for `notmuch-show-process-crypto' in this
@@ -1023,8 +1024,8 @@ the same as for the function notmuch-tree."
 			      (and query-context
 				   (concat " and (" query-context ")"))))
 	 (message-arg (if unthreaded "--unthreaded" "--entire-thread")))
-    (if (equal (car (process-lines notmuch-command "count" search-args)) "0")
-	(setq search-args basic-query))
+    (when (equal (car (process-lines notmuch-command "count" search-args)) "0")
+      (setq search-args basic-query))
     (notmuch-tag-clear-cache)
     (let ((proc (notmuch-start-notmuch
 		 "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel