--- /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 07F86431FC3\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:38 -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 J0IdFgV+WF8p for <notmuch@notmuchmail.org>;\r
+ Sat, 22 Mar 2014 04:51:32 -0700 (PDT)\r
+Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com\r
+ [74.125.82.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ BDA37431FC4 for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:28 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f44.google.com with SMTP id m15so2297691wgh.27\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Mar 2014 04:51:27 -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=fEMkOplF/8Mw2hKMo/NCXZC7c+I/0GeCEv5NVgN/9n8=;\r
+ b=J1TRQ/uxykVrygrbQdzUkA19w6fHjCETv/5XHPpCJtKKLqlKcVCqKvHWyBwGYe+mZl\r
+ QlfQMlz0BIwVQ8lVP4tyCGVtTICNVeYZdeBMK+TnsMl0hL9iODrL42Jh4Lwi0Cow7bP/\r
+ oPc7fB1lTaMkH+flfwOqhb8C+GZl1SZ/XYL50+1M8+M2Cw5ZTEsnOAbyxJwHOPTJovZo\r
+ NBxNb0ITbTgw+/KswbfVP1EUf/soDNzoQWfejl73zyHxHaTn9/oNRTakG2vSz4xaRb0P\r
+ gwOkLQaf/MTEHXEFhjTKP8vZPNejsKPSoHAwoQv7hpskNrrZGhs+MS95zVhC32E9PnSo\r
+ j79Q==\r
+X-Received: by 10.180.164.174 with SMTP id yr14mr3171014wib.18.1395489087661; \r
+ Sat, 22 Mar 2014 04:51:27 -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 c7sm16853318wjf.19.2014.03.22.04.51.26\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 22 Mar 2014 04:51:26 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ amdragon@mit.edu\r
+Subject: [Patch v4 3/8] emacs: tag split customise option for format-tags into\r
+ a widget\r
+Date: Sat, 22 Mar 2014 11:51:07 +0000\r
+Message-Id: <1395489072-19001-4-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:38 -0000\r
+\r
+We will re-use the customize option for format-tags for formattting\r
+deleted tags to added tags in the next patch so split it into a\r
+widget. There should be no functional change.\r
+---\r
+ emacs/notmuch-tag.el | 55 ++++++++++++++++++++++++++------------------------\r
+ 1 file changed, 29 insertions(+), 26 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index 42c425e..a4dea39 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -28,6 +28,34 @@\r
+ (require 'crm)\r
+ (require 'notmuch-lib)\r
+ \r
++(define-widget 'notmuch-tag-format-type 'lazy\r
++ "Customize widget for notmuch-tag-format and friends"\r
++ :type '(alist :key-type (regexp :tag "Tag")\r
++ :extra-offset -3\r
++ :value-type\r
++ (radio :format "%v"\r
++ (const :tag "Hidden" nil)\r
++ (set :tag "Modified"\r
++ (string :tag "Display as")\r
++ (list :tag "Face" :extra-offset -4\r
++ (const :format "" :inline t\r
++ (propertize tag 'face))\r
++ (list :format "%v"\r
++ (const :format "" quote)\r
++ custom-face-edit))\r
++ (list :format "%v" :extra-offset -4\r
++ (const :format "" :inline t\r
++ (notmuch-tag-format-image-data tag))\r
++ (choice :tag "Image"\r
++ (const :tag "Star"\r
++ (notmuch-tag-star-icon))\r
++ (const :tag "Empty star"\r
++ (notmuch-tag-star-empty-icon))\r
++ (const :tag "Tag"\r
++ (notmuch-tag-tag-icon))\r
++ (string :tag "Custom")))\r
++ (sexp :tag "Custom")))))\r
++\r
+ (defcustom notmuch-tag-formats\r
+ '(("unread" (propertize tag 'face '(:foreground "red")))\r
+ ("flagged" (propertize tag 'face '(:foreground "blue"))\r
+@@ -57,34 +85,9 @@ (defcustom notmuch-tag-formats\r
+ \r
+ See also `notmuch-tag-format-image', which can help replace tags\r
+ with images."\r
+-\r
+ :group 'notmuch-search\r
+ :group 'notmuch-show\r
+- :type '(alist :key-type (regexp :tag "Tag")\r
+- :extra-offset -3\r
+- :value-type\r
+- (radio :format "%v"\r
+- (const :tag "Hidden" nil)\r
+- (set :tag "Modified"\r
+- (string :tag "Display as")\r
+- (list :tag "Face" :extra-offset -4\r
+- (const :format "" :inline t\r
+- (propertize tag 'face))\r
+- (list :format "%v"\r
+- (const :format "" quote)\r
+- custom-face-edit))\r
+- (list :format "%v" :extra-offset -4\r
+- (const :format "" :inline t\r
+- (notmuch-tag-format-image-data tag))\r
+- (choice :tag "Image"\r
+- (const :tag "Star"\r
+- (notmuch-tag-star-icon))\r
+- (const :tag "Empty star"\r
+- (notmuch-tag-star-empty-icon))\r
+- (const :tag "Tag"\r
+- (notmuch-tag-tag-icon))\r
+- (string :tag "Custom")))\r
+- (sexp :tag "Custom")))))\r
++ :type 'notmuch-tag-format-type)\r
+ \r
+ (defun notmuch-tag-format-image-data (tag data)\r
+ "Replace TAG with image DATA, if available.\r
+-- \r
+1.7.10.4\r
+\r