Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 4AB05431FD5 for ; Sat, 5 Apr 2014 22:45:17 -0700 (PDT) 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 l6zvbLV4kTpV for ; Sat, 5 Apr 2014 22:45:12 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 23E42431FC0 for ; Sat, 5 Apr 2014 22:45:09 -0700 (PDT) Received: by mail-we0-f178.google.com with SMTP id u56so5143593wes.23 for ; Sat, 05 Apr 2014 22:45:08 -0700 (PDT) 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=xf6y4xOc2eu9covXeS5EG1wn4J7Ha/Fl2STYJUxaXhU=; b=iosbC17J2zfEOBgQH4+2NqhuEXqRXwatopKiumaSuQYQdEpPHue+ZSh7tZkZ53GPek r/x915pL3k5OwRPrKLU6+3RNzQjJmrPU9Q+9G7DFAYkqb/Fet8+3gse8EkLFnCsX1RzF gFWBn6xWvI2+sxZIQG1nppy6r0LLSCdRO6ieANLjKa+bxGi4IQ54EuZ09fevig3CZkTb /u7ZsWXC5alWiKrMkltRJTZzJcs34Z/a5oc8TLV9ED2THC2Kezgh0HydazAubayjpisE REkWKjMm4+wbrq1MM52QXO6/gQ+LR0XpIcrH/bF/YeK7dVu9FAAp0Xyerr3i6KFTuMbf Vp/Q== X-Received: by 10.194.174.100 with SMTP id br4mr794671wjc.83.1396763108084; Sat, 05 Apr 2014 22:45:08 -0700 (PDT) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id ga10sm20130344wjb.23.2014.04.05.22.45.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 05 Apr 2014 22:45:07 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org, amdragon@MIT.EDU Subject: [PATCH v2 3/5] emacs: hello: add a customize for saved-searches Date: Sun, 6 Apr 2014 06:44:47 +0100 Message-Id: <1396763089-32452-4-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com> References: <1396763089-32452-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: Sun, 06 Apr 2014 05:45:17 -0000 Make the defcustom for notmuch-saved-searches use the new plist format. It should still work with oldstyle saved-searches but will write the newstyle form. --- emacs/notmuch-hello.el | 2 +- emacs/notmuch-lib.el | 46 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 568ae47..30f26db 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -323,7 +323,7 @@ (defun notmuch-hello-add-saved-search (widget) ;; Add the new one. (customize-save-variable 'notmuch-saved-searches (add-to-list 'notmuch-saved-searches - (cons name search) t)) + (list :name name :query search) t)) (message "Saved '%s' as '%s'." search name) (notmuch-hello-update))) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 959764e..a54a055 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -107,10 +107,48 @@ (defcustom notmuch-poll-script nil (defvar notmuch-search-history nil "Variable to store notmuch searches history.") -(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox") - ("unread" . "tag:unread")) - "A list of saved searches to display." - :type '(alist :key-type string :value-type string) +(defun notmuch--saved-searches-to-plist (symbol) + "Extract a saved-search variable into plist form. + +The new style saved search is just a plist, but for backwards +compatatibility we use this function to extract old style saved +searches so they still work in customize." + (let ((saved-searches (default-value symbol))) + (mapcar #'notmuch-hello-saved-search-to-plist saved-searches))) + +(define-widget 'notmuch-saved-search-plist 'list + "A single saved search property list." + :tag "Saved Search" + :args '((list :inline t + :format "%v" + (group :format "%v" :inline t (const :format " Name: " :name) (string :format "%v")) + (group :format "%v" :inline t (const :format " Query: " :query) (string :format "%v"))) + (checklist :inline t + :format "%v" + (group :format "%v" :inline t (const :format "Count-Query: " :count-query) (string :format "%v"))))) + +(defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox") + (:name "unread" :query "tag:unread")) + "A list of saved searches to display. + +The saved search can be given in 3 forms. The preferred way is as +a plist. Supported properties are + + :name Name of the search (required). + :query Search to run (required). + :count-query Optional extra query to generate the count + shown. If not present then the :query property + is used. + +Other accepted forms are a cons cell of the form (NAME . QUERY) +or a list of the form (NAME QUERY COUNT-QUERY)." +;; The saved-search format is also used by the all-tags notmuch-hello +;; section. This section generates its own saved-search list in one of +;; the latter two forms. + + :get 'notmuch--saved-searches-to-plist + :type '(repeat notmuch-saved-search-plist) + :tag "List of Saved Searches" :group 'notmuch-hello) (defcustom notmuch-archive-tags '("-inbox") -- 1.7.10.4