[PATCH 1/7] emacs: tag split customise option for format-tags into a widget
authorMark Walters <markwalters1009@gmail.com>
Sat, 18 Jan 2014 23:30:49 +0000 (23:30 +0000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:59:07 +0000 (09:59 -0800)
ef/6e0e32b1ef8ffa429751698f0516dcdf7f7635 [new file with mode: 0644]

diff --git a/ef/6e0e32b1ef8ffa429751698f0516dcdf7f7635 b/ef/6e0e32b1ef8ffa429751698f0516dcdf7f7635
new file mode 100644 (file)
index 0000000..a229a0f
--- /dev/null
@@ -0,0 +1,149 @@
+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 EF859431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:11 -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 upF7W+-6FeJC for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Jan 2014 15:31:06 -0800 (PST)\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 445AA431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:06 -0800 (PST)\r
+Received: by mail-we0-f172.google.com with SMTP id q58so5887388wes.3\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:03 -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=pQOp2HD5bbWcIc3/8jJ0kRnbA2cfsEYhKu0HssIjToE=;\r
+       b=OAli4J2JirZ/MkWd3PatfEQHNGtL2rK76qPgby+IjiJabrjs1G42D6h1sp9tNBgfle\r
+       btd6zaxqu8mfDFCDIgEuRkWj3JBBfFxMc0ygeCLr22dU4KA+dM2/Ur7lEfWUTP2fnk1K\r
+       kbC3iUkyvyMUtM8pQVSzeoZcs1HRNnfXkPckgbdZarZbDo76ka39Q0u1gCiOIKrZVRtl\r
+       PmqsShfnPXsqDunKfWAiV+/cHxyQUZRY45mBLk3BjLtriyNT1H4ZIx0NSDCStd40IAB5\r
+       2freiNkD9xx2OhqLnJ67D5EBbmBkkDPP/vjKYTYLu4ZNijX+LFK+c3vAj3Dq+pMLU4mv\r
+       g1iw==\r
+X-Received: by 10.194.2.70 with SMTP id 6mr8017736wjs.25.1390087863611;\r
+       Sat, 18 Jan 2014 15:31:03 -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\r
+       k10sm13873697wjf.11.2014.01.18.15.31.02 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 18 Jan 2014 15:31:03 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/7] emacs: tag split customise option for format-tags into a\r
+       widget\r
+Date: Sat, 18 Jan 2014 23:30:49 +0000\r
+Message-Id: <1390087855-26194-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1390087855-26194-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, 18 Jan 2014 23:31:12 -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 908e7ad..2153068 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 (string :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
+@@ -53,34 +81,9 @@ of a tag to red, use the expression\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 (string :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