[Patch v3 3/8] emacs: tag split customise option for format-tags into a widget
authorMark Walters <markwalters1009@gmail.com>
Wed, 12 Mar 2014 04:09:52 +0000 (04:09 +0000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:00:42 +0000 (10:00 -0800)
a3/cae658fbb9d7a9dcccb71392296ab4fc837061 [new file with mode: 0644]

diff --git a/a3/cae658fbb9d7a9dcccb71392296ab4fc837061 b/a3/cae658fbb9d7a9dcccb71392296ab4fc837061
new file mode 100644 (file)
index 0000000..d2c3148
--- /dev/null
@@ -0,0 +1,150 @@
+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 674BB431FDD\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:17 -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 wxsBg6IU2p8S for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 21:10:11 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F109C431FC2\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:08 -0700 (PDT)\r
+Received: by mail-we0-f181.google.com with SMTP id q58so10722655wes.40\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:06 -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=m6RdeSD0osdSBfvOTk3XCyll7O34Q+A/S4UUQKohwQU=;\r
+       b=ld4seVrLfiAQfhtDjLMB20c6eDrWrYoTQTefCGGGekoL7375dWpeUCDbu4r55NtBnQ\r
+       ByaCAoxjHF+1XXC0oimM2DWNEmM5jhAFhUbCsmekMVOaZTo9coyq4gtov6mb56VxhqQZ\r
+       cwrwYekKpnHtzsoAvchhqa/Cn3OsnTM7D3KFD0u9DMJz6f/J1otMX036XFbqRZ/+upko\r
+       ntmVfdotBWgP1d47Jqb+bCaGWjbkBckXOUOJlFzCeQ6fdbt2Q14kN1AK2PLejuQLSsXN\r
+       02mixfS3y/TNgcLdotIfyzrwRTj97BNv1Ka2zPeV6XapHkaYxR/KbtLDkrWM9m+xNMNY\r
+       7d9Q==\r
+X-Received: by 10.194.60.16 with SMTP id d16mr10346693wjr.46.1394597406456;\r
+       Tue, 11 Mar 2014 21:10:06 -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
+       h13sm66489426wjr.22.2014.03.11.21.10.05 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 11 Mar 2014 21:10:05 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@mit.edu\r
+Subject: [Patch v3 3/8] emacs: tag split customise option for format-tags into\r
+       a widget\r
+Date: Wed, 12 Mar 2014 04:09:52 +0000\r
+Message-Id: <1394597397-8486-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1394597397-8486-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1394597397-8486-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: Wed, 12 Mar 2014 04:10:17 -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 files 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.9.1\r
+\r