X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=a23d0c2031654ec563cd729092bb49d4f94d557a;hb=c51d5b3cdb5ca0816816e88ca6f7136a24e74eee;hp=dbf269a572755f7b02f19cd090c7c296881057e0;hpb=8a534dc60d5f4bf579eabda9ae482a1982de3e4e;p=notmuch

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index dbf269a5..a23d0c20 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -563,6 +563,10 @@ This function advances the next thread when finished."
   (notmuch-search-remove-tag-thread "inbox")
   (forward-line))
 
+(defvar notmuch-search-process-filter-data nil
+  "Data that has not yet been processed.")
+(make-variable-buffer-local 'notmuch-search-process-filter-data)
+
 (defun notmuch-search-process-sentinel (proc msg)
   "Add a message to let user know when \"notmuch search\" exits"
   (let ((buffer (process-buffer proc))
@@ -580,6 +584,8 @@ This function advances the next thread when finished."
 		      (insert "Incomplete search results (search process was killed).\n"))
 		  (if (eq status 'exit)
 		      (progn
+			(if notmuch-search-process-filter-data
+			    (insert (concat "Error: Unexpected output from notmuch search:\n" notmuch-search-process-filter-data)))
 			(insert "End of search results.")
 			(if (not (= exit-status 0))
 			    (insert (format " (process returned %d)" exit-status)))
@@ -606,7 +612,7 @@ The attributes defined for matching tags are merged, with later
 attributes overriding earlier. A message having both \"delete\"
 and \"unread\" tags with the above settings would have a green
 foreground and blue background."
-  :type '(alist :key-type (string) :value-type (list))
+  :type '(alist :key-type (string) :value-type (custom-face-edit))
   :group 'notmuch)
 
 (defun notmuch-search-color-line (start end line-tag-list)
@@ -736,10 +742,6 @@ non-authors is found, assume that all of the authors match."
 	  do (notmuch-search-insert-field field date count authors subject tags)))
   (insert "\n"))
 
-(defvar notmuch-search-process-filter-data nil
-  "Data that has not yet been processed.")
-(make-variable-buffer-local 'notmuch-search-process-filter-data)
-
 (defun notmuch-search-process-filter (proc string)
   "Process and filter the output of \"notmuch search\""
   (let ((buffer (process-buffer proc))