--- /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 B6034431E82\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:41 -0700 (PDT)\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 FxR2+65PBpco for <notmuch@notmuchmail.org>;\r
+ Sat, 22 Mar 2014 04:51:36 -0700 (PDT)\r
+Received: from mail-we0-f172.google.com (mail-we0-f172.google.com\r
+ [74.125.82.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 754AB431FC7\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:30 -0700 (PDT)\r
+Received: by mail-we0-f172.google.com with SMTP id t61so2289928wes.31\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:29 -0700 (PDT)\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=3mn4Z8Novthzzmi09A36uvLhNRHsr55R10VctPoTDj8=;\r
+ b=0hlIfUEkb/sM1XZsXks10EXbP2/Mptxvt6Xz+s3VaHBmTt99JWHmSZFlBvQnuYqpwN\r
+ Wzxnw1zZEscYRKA6Xz11nE7Ubis6C/Bo+PwHeUOWfyA46JdC10BIs2BulbXzQPRsXaK0\r
+ mnfWCkwYL+ZuLECcO5oQDm2QJfO28/3ocF08J3KPgICMnc/zajLAMkAab5IhhK49DbBV\r
+ CoOyNx5CdvkJ+PYtOZyTJw+QU5zLc5gHEyntyH2LlxpjgOxRMCeNMhfTfzbFMTx7869/\r
+ BWJOEfFaq7Xlw0l1qL1enEk6Dt7zms3rGADz3Ghh6hEV4+xxI9L8fdokbkh+56O0DftF\r
+ eaQA==\r
+X-Received: by 10.180.98.35 with SMTP id ef3mr3313453wib.39.1395489089404;\r
+ Sat, 22 Mar 2014 04:51:29 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id\r
+ bj3sm16866803wjb.14.2014.03.22.04.51.28 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 22 Mar 2014 04:51:28 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ amdragon@mit.edu\r
+Subject: [Patch v4 4/8] emacs: tag: add customize for deleted/added tag\r
+ formats\r
+Date: Sat, 22 Mar 2014 11:51:08 +0000\r
+Message-Id: <1395489072-19001-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1395489072-19001-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, 22 Mar 2014 11:51:42 -0000\r
+\r
+Add customize options for deleted/added tag formats. These are not\r
+used yet but will be later in the series.\r
+\r
+We switch to using `notmuch-apply-face' rather than `propertize' in\r
+the defcustom for faces so that the faces for deleted/added tags add\r
+to the default face attributes for the tag.\r
+\r
+We special case deleting the unread tag as that tag is a strong visual\r
+cue and we don't need that cue when we are just saying it used to be\r
+unread. Thus, we revert to the normal tag face with strikethough for\r
+deleted unread tags.\r
+---\r
+ emacs/notmuch-tag.el | 46 +++++++++++++++++++++++++++++++++++++++++++++-\r
+ 1 file changed, 45 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index a4dea39..3ae5e62 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -39,7 +39,7 @@ (define-widget 'notmuch-tag-format-type 'lazy\r
+ (string :tag "Display as")\r
+ (list :tag "Face" :extra-offset -4\r
+ (const :format "" :inline t\r
+- (propertize tag 'face))\r
++ (notmuch-apply-face tag))\r
+ (list :format "%v"\r
+ (const :format "" quote)\r
+ custom-face-edit))\r
+@@ -87,6 +87,50 @@ (defcustom notmuch-tag-formats\r
+ with images."\r
+ :group 'notmuch-search\r
+ :group 'notmuch-show\r
++ :group 'notmuch-faces\r
++ :type 'notmuch-tag-format-type)\r
++\r
++(defcustom notmuch-tag-deleted-formats\r
++ '(("unread" (notmuch-apply-face bare-tag\r
++ (if (display-supports-face-attributes-p '(:strike-through "red"))\r
++ '(:strike-through "red")\r
++ '(:inverse-video t))))\r
++ (".*" (notmuch-apply-face tag\r
++ (if (display-supports-face-attributes-p '(:strike-through "red"))\r
++ '(:strike-through "red")\r
++ '(:inverse-video t)))))\r
++ "Custom formats for tags when deleted.\r
++\r
++For deleted tags the formats in `notmuch-tag-formats` are applied\r
++first and then these formats are applied on top; that is `tag'\r
++passed to the function is the tag with all these previous\r
++formattings applied. The formatted can access the original\r
++unformatted tag as `bare-tag'.\r
++\r
++By default this shows deleted tags with strike-through in red,\r
++unless strike-through is not available (e.g., emacs is running in\r
++a terminal) in which case it uses inverse video. To hide deleted\r
++tags completely set this to\r
++ '((\".*\" nil))\r
++\r
++See `notmuch-tag-formats' for full documentation."\r
++ :group 'notmuch-show\r
++ :group 'notmuch-faces\r
++ :type 'notmuch-tag-format-type)\r
++\r
++(defcustom notmuch-tag-added-formats\r
++ '((".*" (notmuch-apply-face tag '(:underline "green"))))\r
++ "Custom formats for tags when added.\r
++\r
++For added tags the formats in `notmuch-tag-formats` are applied\r
++first and then these formats are applied on top.\r
++\r
++To disable special formatting of added tags, set this variable to\r
++nil.\r
++\r
++See `notmuch-tag-formats' for full documentation."\r
++ :group 'notmuch-show\r
++ :group 'notmuch-faces\r
+ :type 'notmuch-tag-format-type)\r
+ \r
+ (defun notmuch-tag-format-image-data (tag data)\r
+-- \r
+1.7.10.4\r
+\r