--- /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 2A993431FD0\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:50:08 -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 4DtpIr0WpfrT for <notmuch@notmuchmail.org>;\r
+ Sat, 11 Jan 2014 13:50:00 -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
+ D6A49431FC3 for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:49:59 -0800\r
+ (PST)\r
+Received: by mail-wg0-f41.google.com with SMTP id n12so1574647wgh.2\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 13:49:58 -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=yJLceqTnkLriCky8jgkCvgC010TmwuEQ5Vpy4mbYVBw=;\r
+ b=h8QfxcNMTM+6xMYIV/GSOUtS6R+Z2dJbfhhwP6V6zXj7X4sAGa3ou9AReyvlyxiWpp\r
+ 8EYFVAFCIvSCTMcbqmYxkiZSJDvvjLX+KQj/io2Jy8zQw+RpdqQJhlyGZx9q0dlAM4a2\r
+ p8DVkXeyZKma6O9tHrZI2jcC69RWw5VtlYiAoxNYC8gvCNngzqH/y+fCQ4ncojlEF0nx\r
+ sJJiQmH9sCe5LNUJAmHxQVFjZ22I0UtCt9U2DFCcEoBe9UBgeQiDD0NRRopbf0sRO9Gh\r
+ FbhIlT73waMi5VegBkvRPWB1Nh3QynT1Bvb5Mhj8/i4FHXcqXy4oPpEFVFmSgCZYxL2K\r
+ fqag==\r
+X-Received: by 10.194.219.1 with SMTP id pk1mr14912062wjc.36.1389476998637;\r
+ Sat, 11 Jan 2014 13:49:58 -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 x4sm9562587wif.0.2014.01.11.13.49.57\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 11 Jan 2014 13:49:58 -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: Sat, 11 Jan 2014 21:49:52 +0000\r
+Message-Id: <1389476992-24122-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1389476503-23682-2-git-send-email-markwalters1009@gmail.com>\r
+References: <1389476503-23682-2-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:50:08 -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
+---\r
+\r
+(Sorry if this arrives multiple times: I am having problems sending mail)\r
+\r
+ emacs/notmuch-tag.el | 17 +++++++++--------\r
+ emacs/notmuch-tree.el | 5 +----\r
+ 2 files changed, 10 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 16f2862..4f2ac02 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -704,10 +704,7 @@ 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
++ (format format-string (notmuch-tag-format-tags tags face)))))))\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