--- /dev/null
+Return-Path: <marmstrong@google.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id CA01D6DE02DB\r
+ for <notmuch@notmuchmail.org>; Thu, 21 Jul 2016 14:31:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.935\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.935 tagged_above=-999 required=5 tests=[AWL=0.087,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.211, SPF_PASS=-0.001,\r
+ T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id JnRJuX7qrHq0 for <notmuch@notmuchmail.org>;\r
+ Thu, 21 Jul 2016 14:31:19 -0700 (PDT)\r
+Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com\r
+ [209.85.192.175])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id ED8876DE0361\r
+ for <notmuch@notmuchmail.org>; Thu, 21 Jul 2016 14:30:51 -0700 (PDT)\r
+Received: by mail-pf0-f175.google.com with SMTP id y134so34055412pfg.0\r
+ for <notmuch@notmuchmail.org>; Thu, 21 Jul 2016 14:30:51 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\r
+ s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=C+PNQx3HLycQNruRrGQLPmThPD4j2GUyx4CIhHu0rmM=;\r
+ b=Sucx91TNoju5bgcb2TlE62INnUIXF/gImo08r7FpW2iyMJh7WZa/8ICAuPGKOHukpx\r
+ I8GPb0yrzBvr6WiOlAz6OBii+xQf3aeN3sPxfrFIJs6rF2mbokP6HomiP2OGDF05K/JU\r
+ f2roc8aJJQ0sYQUif6/UvLuO3+CTPImOAbcxAS9m6DhkCp6P1ff0KBkd29TJy1ijIrtl\r
+ nKZscEY4ebGZLO87KEOR7TkbhgZPizn/+2RTcKnKfKHGDxpgkzBSWVBkqOlFXo8glztB\r
+ fN7OIlEzdGlqJPDqMm6sIRfGfmaSwSXwKPV7x7adWlNYGrZZfVKqkQWW42IzusEal+zG lOZA==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=C+PNQx3HLycQNruRrGQLPmThPD4j2GUyx4CIhHu0rmM=;\r
+ b=IvlcF56MoyivAk6c2rL0dYykVUDuOSWmcZZDlLBJdeb17XOemSNNqtMZfahhbk4i+w\r
+ 3pdxXH8etOdTW+tLFXzaZBPPSnS5wwP+mo7umHIBHxwSuNgZSqpRjkXxn0DanFKG5I6w\r
+ dQ8ikKXOxD3FDSx9dGjwxDH0DZ0Fz1JC9SnaXnQIpw6CG7h62uZL8F0FnMY5v7Fsb9Y2\r
+ 2T9GPLIqa+IWsFOzZbpy6hFAQ0ENUvzfRWnQnfsDyoNG2RB5ERqiEnDtAB4BlXRb6nIp\r
+ seZSu/b0xzQJL0Z+8N/Vi96KmoNRn6ErWBgl6S933MonU267Cv4G6ldOysVGDTWe/u3C\r
+ WUBg==\r
+X-Gm-Message-State:\r
+ AEkoouu/+jptLSg3IunmT1pTc4v4ljdpttgAP2lGh7xiWDCAIsPoxQ+ibHi+1kFEiz4X4rQ+\r
+X-Received: by 10.98.213.130 with SMTP id d124mr596780pfg.118.1469136651164;\r
+ Thu, 21 Jul 2016 14:30:51 -0700 (PDT)\r
+Received: from marmstrong-linux.kir.corp.google.com ([172.31.9.105])\r
+ by smtp.gmail.com with ESMTPSA id ra13sm14496645pac.29.2016.07.21.14.30.48\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\r
+ Thu, 21 Jul 2016 14:30:50 -0700 (PDT)\r
+From: Matt Armstrong <marmstrong@google.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: express notmuch-search-line-faces in terms of two\r
+ new faces: notmuch-search-flagged-face and notmuch-search-unread-face.\r
+Date: Thu, 21 Jul 2016 14:30:33 -0700\r
+Message-Id: <1469136633-19235-3-git-send-email-marmstrong@google.com>\r
+X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020\r
+In-Reply-To: <1469136633-19235-1-git-send-email-marmstrong@google.com>\r
+References: <1469136633-19235-1-git-send-email-marmstrong@google.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 21 Jul 2016 21:31:26 -0000\r
+\r
+This makes it easier to find the relevant face by customizing\r
+notmuch-faces. I plan to do the same to the other alists of faces\r
+found elsewhere.\r
+---\r
+ NEWS | 7 +++++++\r
+ emacs/notmuch.el | 39 ++++++++++++++++++++++++++++++++-------\r
+ 2 files changed, 39 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index ab661d4..49f8bb5 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -37,6 +37,13 @@ Respect charset of MIME parts when reading them\r
+ \r
+ Fix previous assumption that everyone uses UTF-8.\r
+ \r
++Face customization is easier\r
++\r
++ New faces `notmuch-search-flagged-face` and\r
++ `notmuch-search-unread-face` are used by default by\r
++ `notmuch-search-line-faces`. Customize `notmuch-faces` to modify\r
++ them.\r
++\r
+ Notmuch 0.22 (2016-04-26)\r
+ =========================\r
+ \r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 8acdef3..43d56f7 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -311,6 +311,26 @@ there will be called at other points of notmuch execution."\r
+ :group 'notmuch-search\r
+ :group 'notmuch-faces)\r
+ \r
++(defface notmuch-search-flagged-face\r
++ '((t\r
++ (:weight bold)))\r
++ "Face used in search mode face for flagged threads.\r
++\r
++This face is the default value for the \"flagged\" tag in\r
++`notmuch-search-line-faces`."\r
++ :group 'notmuch-search\r
++ :group 'notmuch-faces)\r
++\r
++(defface notmuch-search-unread-face\r
++ '((t\r
++ (:foreground "blue")))\r
++ "Face used in search mode for unread threads.\r
++\r
++This face is the default value for the \"unread\" tag in\r
++`notmuch-search-line-faces`."\r
++ :group 'notmuch-search\r
++ :group 'notmuch-faces)\r
++\r
+ (defun notmuch-search-mode ()\r
+ "Major mode displaying results of a notmuch search.\r
+ \r
+@@ -654,9 +674,12 @@ of the result."\r
+ (goto-char (point-min))\r
+ (forward-line (1- notmuch-search-target-line)))))))))\r
+ \r
+-(defcustom notmuch-search-line-faces '(("unread" :weight bold)\r
+- ("flagged" :foreground "blue"))\r
+- "Tag/face mapping for line highlighting in notmuch-search.\r
++(defcustom notmuch-search-line-faces\r
++ '(("unread" 'notmuch-search-unread-face)\r
++ ("flagged" 'notmuch-search-flagged-face))\r
++ "Alist of tags to faces for line highlighting in notmuch-search.\r
++Each element looks like (TAG . FACE).\r
++A thread with TAG will have FACE applied.\r
+ \r
+ Here is an example of how to color search results based on tags.\r
+ (the following text would be placed in your ~/.emacs file):\r
+@@ -665,10 +688,12 @@ Here is an example of how to color search results based on tags.\r
+ (\"deleted\" . (:foreground \"red\"\r
+ :background \"blue\"))))\r
+ \r
+-The attributes defined for matching tags are merged, with earlier\r
+-attributes overriding later. A message having both \"deleted\"\r
+-and \"unread\" tags with the above settings would have a green\r
+-foreground and blue background."\r
++The FACE must be a face name (a symbol or string), a property\r
++list of face attributes, or a list of these. The faces for\r
++matching tags are merged, with earlier attributes overriding\r
++later. A message having both \"deleted\" and \"unread\" tags with\r
++the above settings would have a green foreground and blue\r
++background."\r
+ :type '(alist :key-type (string) :value-type (custom-face-edit))\r
+ :group 'notmuch-search\r
+ :group 'notmuch-faces)\r
+-- \r
+2.8.0.rc3.226.g39d4020\r
+\r