--- /dev/null
+Return-Path: <markwalters1009@gmail.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 olra.theworths.org (Postfix) with ESMTP id 5A090431FC3\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:42:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] 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 Tbz-dVxztrEv for <notmuch@notmuchmail.org>;\r
+ Sat, 11 Jan 2014 13:41:56 -0800 (PST)\r
+Received: from mail-we0-f175.google.com (mail-we0-f175.google.com\r
+ [74.125.82.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9E630431FD0\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:41:56 -0800 (PST)\r
+Received: by mail-we0-f175.google.com with SMTP id p61so113223wes.20\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:41:52 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=cNt7MSxwWZEo1TF7/8WRLuR/w8/2+lcHDIUevzQ0ZpM=;\r
+ b=Fmq7GkNxZlozZlzYIP+m5gnV09wwyKXnqROx9w5YxV5EC2aPuDjfU62r11WOBDq/cx\r
+ F6h4b32dnSYNtZJ16bHiKId1mTrTBqUzToW2y0zKQCTWigBe98VmcTbLRwQ/piSE6yiV\r
+ Iwj6gtOSoiyrIy0Rui7s9v6ffwGsyB5597uHPYqfwygFHn53uvh1sSTsa4IU3/KhXnPF\r
+ i1sQ22LqmmHLnA7tlhNZ4+27XdFfPmDK/H/px0aquqLNo+IjJzDI9/Q0YhVUY24IClYE\r
+ aSK6barXbNocXPQumuREnIv6pxd1TDa1voR/JaYIL5QG7V+iVwuxGEBZdCOVYX7ibCnf\r
+ N4gA==\r
+X-Received: by 10.180.89.193 with SMTP id bq1mr8743437wib.22.1389476512788;\r
+ Sat, 11 Jan 2014 13:41:52 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id po3sm7519383wjc.3.2014.01.11.13.41.52\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 11 Jan 2014 13:41:52 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: tree: default face for matching/non-matching\r
+ messages\r
+Date: Sat, 11 Jan 2014 21:41:42 +0000\r
+Message-Id: <1389476503-23682-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1389476503-23682-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1389476503-23682-1-git-send-email-markwalters1009@gmail.com>\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, 11 Jan 2014 21:42:03 -0000\r
+\r
+This adds default faces for matching and non-matching messages. This\r
+makes it easier for a user to do broad customization without having to\r
+customize every field. It also fits more neatly with the next patch\r
+which switches to using notmuch-tag-format-tags for tag formatting.\r
+\r
+We set the field specific face customization to nil for all the fields\r
+which use the message default face to make it clear to a user which\r
+fields customizations are being used.\r
+---\r
+ emacs/notmuch-tree.el | 36 ++++++++++++++++++++++++++----------\r
+ 1 files changed, 26 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 0ce7fa8..16f2862 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -70,8 +70,14 @@ Note the author string should not contain\r
+ :group 'notmuch-tree)\r
+ \r
+ ;; Faces for messages that match the query.\r
+-(defface notmuch-tree-match-date-face\r
++(defface notmuch-tree-match-face\r
+ '((t :inherit default))\r
++ "Default face used in tree mode face for matching messages"\r
++ :group 'notmuch-tree\r
++ :group 'notmuch-faces)\r
++\r
++(defface notmuch-tree-match-date-face\r
++ nil\r
+ "Face used in tree mode for the date in messages matching the query."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+@@ -90,13 +96,13 @@ Note the author string should not contain\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-match-subject-face\r
+- '((t :inherit default))\r
++ nil\r
+ "Face used in tree mode for the subject in messages matching the query."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-match-tree-face\r
+- '((t :inherit default))\r
++ nil\r
+ "Face used in tree mode for the thread tree block graphics in messages matching the query."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+@@ -115,32 +121,38 @@ Note the author string should not contain\r
+ :group 'notmuch-faces)\r
+ \r
+ ;; Faces for messages that do not match the query.\r
+-(defface notmuch-tree-no-match-date-face\r
++(defface notmuch-tree-no-match-face\r
+ '((t (:foreground "gray")))\r
++ "Default face used in tree mode face for non-matching messages"\r
++ :group 'notmuch-tree\r
++ :group 'notmuch-faces)\r
++\r
++(defface notmuch-tree-no-match-date-face\r
++ nil\r
+ "Face used in tree mode for non-matching dates."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-no-match-subject-face\r
+- '((t (:foreground "gray")))\r
++ nil\r
+ "Face used in tree mode for non-matching subjects."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-no-match-tree-face\r
+- '((t (:foreground "gray")))\r
++ nil\r
+ "Face used in tree mode for the thread tree block graphics in messages matching the query."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-no-match-author-face\r
+- '((t (:foreground "gray")))\r
++ nil\r
+ "Face used in tree mode for the date in messages matching the query."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+ \r
+ (defface notmuch-tree-no-match-tag-face\r
+- '((t (:foreground "gray")))\r
++ nil\r
+ "Face used in tree mode face for non-matching tags."\r
+ :group 'notmuch-tree\r
+ :group 'notmuch-faces)\r
+@@ -699,10 +711,14 @@ unchanged ADDRESS if parsing fails."\r
+ \r
+ (defun notmuch-tree-format-field-list (field-list msg)\r
+ "Format fields of MSG according to FIELD-LIST and return string"\r
+- (let (result-string)\r
++ (let ((face (if (plist-get msg :match)\r
++ 'notmuch-tree-match-face\r
++ 'notmuch-tree-no-match-face))\r
++ (result-string))\r
+ (dolist (spec field-list result-string)\r
+ (let ((field-string (notmuch-tree-format-field (car spec) (cdr spec) msg)))\r
+- (setq result-string (concat result-string field-string))))))\r
++ (setq result-string (concat result-string field-string))))\r
++ (notmuch-combine-face-text-property-string result-string face t)))\r
+ \r
+ (defun notmuch-tree-insert-msg (msg)\r
+ "Insert the message MSG according to notmuch-tree-result-format"\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff