emacs: Use 'and' instead of 'when' when the return value matters

[notmuch] / emacs / notmuch-tree.el

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index b1bb40b13ac469e5adc1f7d1ba2fecdd99694eb2..37a5d1c843015c6226ec217f2d59bda414473914 100644 (file)
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -956,8 +956,8 @@ Complete list of currently available key bindings:
 \\{notmuch-tree-mode-map}"
   (setq notmuch-buffer-refresh-function #'notmuch-tree-refresh-view)
   (hl-line-mode 1)
-  (setq buffer-read-only t
-       truncate-lines t))
+  (setq buffer-read-only t)
+  (setq truncate-lines t))
 
 (defun notmuch-tree-process-sentinel (proc msg)
   "Add a message to let user know when \"notmuch tree\" exits."
@@ -1020,8 +1020,8 @@ the same as for the function notmuch-tree."
   (erase-buffer)
   (goto-char (point-min))
   (let* ((search-args (concat basic-query
-                             (if query-context
-                                 (concat " and (" query-context ")"))))
+                             (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))