From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id EF859431FBC for ; Sat, 18 Jan 2014 15:31:11 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.201 X-Spam-Level: X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id upF7W+-6FeJC for ; Sat, 18 Jan 2014 15:31:06 -0800 (PST) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 445AA431FBD for ; Sat, 18 Jan 2014 15:31:06 -0800 (PST) Received: by mail-we0-f172.google.com with SMTP id q58so5887388wes.3 for ; Sat, 18 Jan 2014 15:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pQOp2HD5bbWcIc3/8jJ0kRnbA2cfsEYhKu0HssIjToE=; b=OAli4J2JirZ/MkWd3PatfEQHNGtL2rK76qPgby+IjiJabrjs1G42D6h1sp9tNBgfle btd6zaxqu8mfDFCDIgEuRkWj3JBBfFxMc0ygeCLr22dU4KA+dM2/Ur7lEfWUTP2fnk1K kbC3iUkyvyMUtM8pQVSzeoZcs1HRNnfXkPckgbdZarZbDo76ka39Q0u1gCiOIKrZVRtl PmqsShfnPXsqDunKfWAiV+/cHxyQUZRY45mBLk3BjLtriyNT1H4ZIx0NSDCStd40IAB5 2freiNkD9xx2OhqLnJ67D5EBbmBkkDPP/vjKYTYLu4ZNijX+LFK+c3vAj3Dq+pMLU4mv g1iw== X-Received: by 10.194.2.70 with SMTP id 6mr8017736wjs.25.1390087863611; Sat, 18 Jan 2014 15:31:03 -0800 (PST) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id k10sm13873697wjf.11.2014.01.18.15.31.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 18 Jan 2014 15:31:03 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH 1/7] emacs: tag split customise option for format-tags into a widget Date: Sat, 18 Jan 2014 23:30:49 +0000 Message-Id: <1390087855-26194-2-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com> References: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 23:31:12 -0000 We will re-use the customize option for format-tags for formattting deleted tags to added tags in the next patch so split it into a widget. There should be no functional change. --- emacs/notmuch-tag.el | 55 ++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el index 908e7ad..2153068 100644 --- a/emacs/notmuch-tag.el +++ b/emacs/notmuch-tag.el @@ -28,6 +28,34 @@ (require 'crm) (require 'notmuch-lib) +(define-widget 'notmuch-tag-format-type 'lazy + "Customize widget for notmuch-tag-format and friends" + :type '(alist :key-type (string :tag "Tag") + :extra-offset -3 + :value-type + (radio :format "%v" + (const :tag "Hidden" nil) + (set :tag "Modified" + (string :tag "Display as") + (list :tag "Face" :extra-offset -4 + (const :format "" :inline t + (propertize tag 'face)) + (list :format "%v" + (const :format "" quote) + custom-face-edit)) + (list :format "%v" :extra-offset -4 + (const :format "" :inline t + (notmuch-tag-format-image-data tag)) + (choice :tag "Image" + (const :tag "Star" + (notmuch-tag-star-icon)) + (const :tag "Empty star" + (notmuch-tag-star-empty-icon)) + (const :tag "Tag" + (notmuch-tag-tag-icon)) + (string :tag "Custom"))) + (sexp :tag "Custom"))))) + (defcustom notmuch-tag-formats '(("unread" (propertize tag 'face '(:foreground "red"))) ("flagged" (propertize tag 'face '(:foreground "blue")) @@ -53,34 +81,9 @@ of a tag to red, use the expression See also `notmuch-tag-format-image', which can help replace tags with images." - :group 'notmuch-search :group 'notmuch-show - :type '(alist :key-type (string :tag "Tag") - :extra-offset -3 - :value-type - (radio :format "%v" - (const :tag "Hidden" nil) - (set :tag "Modified" - (string :tag "Display as") - (list :tag "Face" :extra-offset -4 - (const :format "" :inline t - (propertize tag 'face)) - (list :format "%v" - (const :format "" quote) - custom-face-edit)) - (list :format "%v" :extra-offset -4 - (const :format "" :inline t - (notmuch-tag-format-image-data tag)) - (choice :tag "Image" - (const :tag "Star" - (notmuch-tag-star-icon)) - (const :tag "Empty star" - (notmuch-tag-star-empty-icon)) - (const :tag "Tag" - (notmuch-tag-tag-icon)) - (string :tag "Custom"))) - (sexp :tag "Custom"))))) + :type 'notmuch-tag-format-type) (defun notmuch-tag-format-image-data (tag data) "Replace TAG with image DATA, if available. -- 1.7.9.1