Merge branch 'release'

[notmuch] / emacs / notmuch.el

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 63387a2dfe28c85fce445dc0a1f74d63498f3d0f..4c1a6cacd4da5bdf47a13919cedaef2538457b30 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -654,11 +654,14 @@ of the result."
                    ;; showing the search buffer
                    (when (or (= exit-status 20) (= exit-status 21))
                      (kill-buffer))
-                   (condition-case nil
+                   (condition-case err
                        (notmuch-check-async-exit-status proc msg)
                      ;; Suppress the error signal since strange
-                     ;; things happen if a sentinel signals.
-                     (error (throw 'return nil)))
+                     ;; things happen if a sentinel signals.  Mimic
+                     ;; the top-level's handling of error messages.
+                     (error
+                      (message "%s" (error-message-string err))
+                      (throw 'return nil)))
                    (if (and atbob
                             (not (string= notmuch-search-target-thread "found")))
                        (set 'never-found-target-thread t)))))
@@ -794,9 +797,8 @@ non-authors is found, assume that all of the authors match."
     (notmuch-search-insert-authors format-string (plist-get result :authors)))
 
    ((string-equal field "tags")
-    (let ((tags-str (mapconcat 'identity (plist-get result :tags) " ")))
-      (insert (propertize (format format-string tags-str)
-                         'face 'notmuch-tag-face))))))
+    (let ((tags (plist-get result :tags)))
+      (insert (format format-string (notmuch-tag-format-tags tags)))))))
 
 (defun notmuch-search-show-result (result &optional pos)
   "Insert RESULT at POS or the end of the buffer if POS is null."