From: Carl Worth <cworth@cworth.org>
Date: Mon, 25 Apr 2011 21:26:42 +0000 (-0700)
Subject: Merge remote-tracking branch 'amdragon/eager-metadata-v4'
X-Git-Tag: debian/0.6_254~169
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=df91c16943aa4f5c47452fa7d21e65df2d9e315b;hp=b599bbe6721f6320c732ec7187f798ce60781887

Merge remote-tracking branch 'amdragon/eager-metadata-v4'
---

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 92a86cf2..a23d0c20 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -612,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)