[WIP Patch 2/7] emacs: tag split customise option for format-tags into a widget
authorMark Walters <markwalters1009@gmail.com>
Fri, 14 Feb 2014 09:15:14 +0000 (09:15 +0000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:00:00 +0000 (10:00 -0800)
4f/f36c324ab429d64071dcc417d3c3a284783600 [new file with mode: 0644]

diff --git a/4f/f36c324ab429d64071dcc417d3c3a284783600 b/4f/f36c324ab429d64071dcc417d3c3a284783600
new file mode 100644 (file)
index 0000000..89db9d8
--- /dev/null
@@ -0,0 +1,151 @@
+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 A6152431FC9\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:39 -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 KR0YeB5pFU4m for <notmuch@notmuchmail.org>;\r
+       Fri, 14 Feb 2014 01:15:34 -0800 (PST)\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 7AC89431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:31 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id w61so8247655wes.26\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:30 -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=rultwBrs7Y3s+niuk9gecquq6NlqzBQEbD5xgohpGMc=;\r
+       b=s+8YnC40C1vgSh3tKaKq3bj0nGUqsLqJmD60SMQSfmszjLu2ZfuvwINv+4qKDBZO2k\r
+       HxiG/LxgpONGT2XWhwitQzdIQBF+3MXalSUXS0q1/+gndwLfqR5hHuVuz0qPWnixwInq\r
+       tt6bA7LjM61iR0dP/mMm9YSr21yOG+JYzz7l78pMV07jlsCtIrR5UyYLlRRjIV4Olkkq\r
+       xx6y+BtpqxYjA59hA/eDXcM0ds40uysQ0yxx/nEOW4fd6Chidzb9cyxahKqOEqoCwTLP\r
+       yYM/i99w3iWvC94fSR5M3snD3JD8F3h63WC1bQh3CoSxRkmRVDc3ElagZOlM6df5Xyuk\r
+       jLUA==\r
+X-Received: by 10.181.13.11 with SMTP id eu11mr1253954wid.30.1392369329062;\r
+       Fri, 14 Feb 2014 01:15:29 -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 uq2sm11141686wjc.5.2014.02.14.01.15.28\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 14 Feb 2014 01:15:28 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       Austin Clements <amdragon@MIT.EDU>\r
+Subject: [WIP Patch 2/7] emacs: tag split customise option for format-tags\r
+       into a widget\r
+Date: Fri, 14 Feb 2014 09:15:14 +0000\r
+Message-Id: <1392369319-24508-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1392369319-24508-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1392369319-24508-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: Fri, 14 Feb 2014 09:15:39 -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 cb88fd5..f987291 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -40,6 +40,34 @@\r
+ This must be called after changes to `notmuch-tag-formats'."\r
+   (clrhash notmuch-tag--format-cache))\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
+@@ -73,35 +101,10 @@ this automatically.\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
+   :set (lambda (var val) (set-default var val) (notmuch-tag-clear-cache))\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