--- /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 8ED4C431FD8\r
+ for <notmuch@notmuchmail.org>; Thu, 19 Dec 2013 11:12:49 -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 RztXHrTcSlSd for <notmuch@notmuchmail.org>;\r
+ Thu, 19 Dec 2013 11:12:43 -0800 (PST)\r
+Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com\r
+ [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 75E89431FDB for <notmuch@notmuchmail.org>; Thu, 19 Dec 2013 11:12:42 -0800\r
+ (PST)\r
+Received: by mail-wg0-f41.google.com with SMTP id y10so6090285wgg.4\r
+ for <notmuch@notmuchmail.org>; Thu, 19 Dec 2013 11:12:39 -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=nfag8NeuUcbDAG8pDNPTv5ONYFzW2Dx0P776BU9gO88=;\r
+ b=lhkQ+GGnEudcpy7d4S8t3QiBMN0KnNpR54TwsJFHquQR99slTAL63lfmn2n9ANZA32\r
+ XJoZAb2l2YLbEexf7mc+pgZZ4x935ZSZXqr5RaAmRS6hmmcw/NO1xa7f2mk3a36QYa8G\r
+ rSwZfyLYmMWYaTXXgyHbmHIeHvy+RGoqlyFBeLR0tSmYZg/cytiE/GnCVkauMC+Tck39\r
+ wyHDmMyrZIa5MonVDvQKJ8UwSPPBiFCqwU9PuFyfmgNz3C4wDxx82pYRNTPYQUaSsBzw\r
+ 5//XIxJ0ruh1qul1kc7atN9d85hz/qjB/PeXT0NYV51JQU8JYKWIzhdKjIugjG7gXq1a\r
+ 5E4Q==\r
+X-Received: by 10.180.108.132 with SMTP id hk4mr4155876wib.12.1387480359781;\r
+ Thu, 19 Dec 2013 11:12:39 -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 qj4sm719095wjc.15.2013.12.19.11.12.38\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Thu, 19 Dec 2013 11:12:39 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: tree: use tag-format-tags\r
+Date: Thu, 19 Dec 2013 19:12:24 +0000\r
+Message-Id: <1387480344-14326-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1387480344-14326-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1387480344-14326-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: Thu, 19 Dec 2013 19:12:50 -0000\r
+\r
+Previously tree did not use tag-format-tags: since tree wants to\r
+distinguish matching messages from non-matching messages it is not a\r
+perfect fit.\r
+\r
+However, in preparation for allowing tag-changes to be shown (i.e.,\r
+added or deleted tags to be indicated) it is convenient to make all\r
+places displaying tags call the same routines.\r
+\r
+We modify notmuch-tag-format-tags slightly so that it can take and\r
+argument for the default characteristics of the face before the\r
+special tag features are applied.\r
+\r
+This also means that things like the star symbol for flagged messages\r
+all work in tree.\r
+---\r
+ emacs/notmuch-tag.el | 17 +++++++++--------\r
+ emacs/notmuch-tree.el | 8 ++++----\r
+ 2 files changed, 13 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index b60f46c..908e7ad 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -148,15 +148,16 @@ This can be used with `notmuch-tag-format-image-data'."\r
+ (dolist (format (cdr formats) tag)\r
+ (setq tag (eval format))))))))\r
+ \r
+-(defun notmuch-tag-format-tags (tags)\r
++(defun notmuch-tag-format-tags (tags &optional face)\r
+ "Return a string representing formatted TAGS."\r
+- (notmuch-combine-face-text-property-string\r
+- (mapconcat #'identity\r
+- ;; nil indicated that the tag was deliberately hidden\r
+- (delq nil (mapcar #'notmuch-tag-format-tag tags))\r
+- " ")\r
+- 'notmuch-tag-face\r
+- t))\r
++ (let ((face (or face 'notmuch-tag-face)))\r
++ (notmuch-combine-face-text-property-string\r
++ (mapconcat #'identity\r
++ ;; nil indicated that the tag was deliberately hidden\r
++ (delq nil (mapcar #'notmuch-tag-format-tag tags))\r
++ " ")\r
++ face\r
++ t)))\r
+ \r
+ (defcustom notmuch-before-tag-hook nil\r
+ "Hooks that are run before tags of a message are modified.\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 599f76e..ee20f1a 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -690,10 +690,10 @@ unchanged ADDRESS if parsing fails."\r
+ (face (if match\r
+ 'notmuch-tree-match-tag-face\r
+ 'notmuch-tree-no-match-tag-face)))\r
+- (propertize (format format-string\r
+- (mapconcat #'identity tags " "))\r
+- 'face face))))))\r
+-\r
++ (notmuch-combine-face-text-property-string\r
++ (format format-string (notmuch-tag-format-tags tags face))\r
++ face\r
++ t))))))\r
+ \r
+ (defun notmuch-tree-format-field-list (field-list msg)\r
+ "Format fields of MSG according to FIELD-LIST and return string"\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff