Merge branch 'release'

[notmuch] / emacs / notmuch.el

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index c98a4febbf69f9dcc100aa8e2b3449d77a9ed89d..4c1a6cacd4da5bdf47a13919cedaef2538457b30 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -660,7 +660,7 @@ of the result."
                      ;; things happen if a sentinel signals.  Mimic
                      ;; the top-level's handling of error messages.
                      (error
-                      (message "%s" (second err))
+                      (message "%s" (error-message-string err))
                       (throw 'return nil)))
                    (if (and atbob
                             (not (string= notmuch-search-target-thread "found")))
@@ -797,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."