--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2311E431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:17:22 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id a-ox61ipEUHP for <notmuch@notmuchmail.org>;\r
+ Sat, 28 Jan 2012 03:17:21 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 880EC431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:17:21 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Rr6HY-0002ui-3e; Sat, 28 Jan 2012 11:17:20 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Rr6HX-0001gZ-Rw; Sat, 28 Jan 2012 11:17:19 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>\r
+Subject: Re: [PATCH] emacs: add default value to notmuch-search-line-faces\r
+In-Reply-To: <871uqk6q60.fsf@qmul.ac.uk>\r
+References: <1327605679-15213-1-git-send-email-jani@nikula.org>\r
+ <87y5st4ewt.fsf@qmul.ac.uk>\r
+ <cunhazhjurs.fsf@hotblack-desiato.hh.sledj.net>\r
+ <871uqk6q60.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.11+107~g185f859 (http://notmuchmail.org) Emacs/23.2.1\r
+ (i486-pc-linux-gnu)\r
+Date: Sat, 28 Jan 2012 11:18:23 +0000\r
+Message-ID: <87y5ss5b40.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 3c3f0c11cb0b50a4d2574c9d85ccdbb8 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 Jan 2012 11:17:22 -0000\r
+\r
+\r
+I wondered whether the general view is that this following trivial\r
+extension to David's notmuch-show-line-faces patch is too gross/hacky to\r
+live? It passes a fake tag of "flag:match" to notmuch-color-line so that\r
+the same customisation as for colouring lines based on tags can also\r
+colour based on match. I find it useful when using the collapsed view\r
+for example.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index c448ab2..00c1a2f 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -837,11 +837,14 @@ current buffer, if possible."\r
+ content-start content-end\r
+ headers-start headers-end\r
+ body-start body-end\r
++ tags-and-flags\r
+ (headers-invis-spec (notmuch-show-make-symbol "header"))\r
+ (message-invis-spec (notmuch-show-make-symbol "message"))\r
+ (bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))\r
+ (tags (plist-get msg :tags)))\r
+ \r
++ (if (plist-get msg :match)\r
++ (setq tags-and-flags (append tags '("flag:match"))))\r
+ ;; Set `buffer-invisibility-spec' to `nil' (a list), otherwise\r
+ ;; removing items from `buffer-invisibility-spec' (which is what\r
+ ;; `notmuch-show-headers-visible' and\r
+@@ -870,7 +873,7 @@ current buffer, if possible."\r
+ (setq content-start (point-marker))\r
+ \r
+ ;; Colour the header line according to the tags of the message.\r
+- (notmuch-color-line message-start content-start tags notmuch-show-line-faces)\r
++ (notmuch-color-line message-start content-start tags-and-flags notmuch-show-line-faces)\r
+ \r
+ (plist-put msg :headers-invis-spec headers-invis-spec)\r
+ (plist-put msg :message-invis-spec message-invis-spec)\r
+-- \r
+1.7.2.3\r
+\r