1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4AB05431FD5
\r
6 for <notmuch@notmuchmail.org>; Sat, 5 Apr 2014 22:45:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id l6zvbLV4kTpV for <notmuch@notmuchmail.org>;
\r
18 Sat, 5 Apr 2014 22:45:12 -0700 (PDT)
\r
19 Received: from mail-we0-f178.google.com (mail-we0-f178.google.com
\r
20 [74.125.82.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 23E42431FC0
\r
23 for <notmuch@notmuchmail.org>; Sat, 5 Apr 2014 22:45:09 -0700 (PDT)
\r
24 Received: by mail-we0-f178.google.com with SMTP id u56so5143593wes.23
\r
25 for <notmuch@notmuchmail.org>; Sat, 05 Apr 2014 22:45:08 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
28 bh=xf6y4xOc2eu9covXeS5EG1wn4J7Ha/Fl2STYJUxaXhU=;
\r
29 b=iosbC17J2zfEOBgQH4+2NqhuEXqRXwatopKiumaSuQYQdEpPHue+ZSh7tZkZ53GPek
\r
30 r/x915pL3k5OwRPrKLU6+3RNzQjJmrPU9Q+9G7DFAYkqb/Fet8+3gse8EkLFnCsX1RzF
\r
31 gFWBn6xWvI2+sxZIQG1nppy6r0LLSCdRO6ieANLjKa+bxGi4IQ54EuZ09fevig3CZkTb
\r
32 /u7ZsWXC5alWiKrMkltRJTZzJcs34Z/a5oc8TLV9ED2THC2Kezgh0HydazAubayjpisE
\r
33 REkWKjMm4+wbrq1MM52QXO6/gQ+LR0XpIcrH/bF/YeK7dVu9FAAp0Xyerr3i6KFTuMbf
\r
35 X-Received: by 10.194.174.100 with SMTP id br4mr794671wjc.83.1396763108084;
\r
36 Sat, 05 Apr 2014 22:45:08 -0700 (PDT)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPSA id
\r
39 ga10sm20130344wjb.23.2014.04.05.22.45.07 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Sat, 05 Apr 2014 22:45:07 -0700 (PDT)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org,
\r
45 Subject: [PATCH v2 3/5] emacs: hello: add a customize for saved-searches
\r
46 Date: Sun, 6 Apr 2014 06:44:47 +0100
\r
47 Message-Id: <1396763089-32452-4-git-send-email-markwalters1009@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.10.4
\r
49 In-Reply-To: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com>
\r
50 References: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com>
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Sun, 06 Apr 2014 05:45:17 -0000
\r
65 Make the defcustom for notmuch-saved-searches use the new plist
\r
66 format. It should still work with oldstyle saved-searches but will
\r
67 write the newstyle form.
\r
69 emacs/notmuch-hello.el | 2 +-
\r
70 emacs/notmuch-lib.el | 46 ++++++++++++++++++++++++++++++++++++++++++----
\r
71 2 files changed, 43 insertions(+), 5 deletions(-)
\r
73 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
74 index 568ae47..30f26db 100644
\r
75 --- a/emacs/notmuch-hello.el
\r
76 +++ b/emacs/notmuch-hello.el
\r
77 @@ -323,7 +323,7 @@ (defun notmuch-hello-add-saved-search (widget)
\r
79 (customize-save-variable 'notmuch-saved-searches
\r
80 (add-to-list 'notmuch-saved-searches
\r
81 - (cons name search) t))
\r
82 + (list :name name :query search) t))
\r
83 (message "Saved '%s' as '%s'." search name)
\r
84 (notmuch-hello-update)))
\r
86 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
87 index 959764e..a54a055 100644
\r
88 --- a/emacs/notmuch-lib.el
\r
89 +++ b/emacs/notmuch-lib.el
\r
90 @@ -107,10 +107,48 @@ (defcustom notmuch-poll-script nil
\r
91 (defvar notmuch-search-history nil
\r
92 "Variable to store notmuch searches history.")
\r
94 -(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox")
\r
95 - ("unread" . "tag:unread"))
\r
96 - "A list of saved searches to display."
\r
97 - :type '(alist :key-type string :value-type string)
\r
98 +(defun notmuch--saved-searches-to-plist (symbol)
\r
99 + "Extract a saved-search variable into plist form.
\r
101 +The new style saved search is just a plist, but for backwards
\r
102 +compatatibility we use this function to extract old style saved
\r
103 +searches so they still work in customize."
\r
104 + (let ((saved-searches (default-value symbol)))
\r
105 + (mapcar #'notmuch-hello-saved-search-to-plist saved-searches)))
\r
107 +(define-widget 'notmuch-saved-search-plist 'list
\r
108 + "A single saved search property list."
\r
109 + :tag "Saved Search"
\r
110 + :args '((list :inline t
\r
112 + (group :format "%v" :inline t (const :format " Name: " :name) (string :format "%v"))
\r
113 + (group :format "%v" :inline t (const :format " Query: " :query) (string :format "%v")))
\r
114 + (checklist :inline t
\r
116 + (group :format "%v" :inline t (const :format "Count-Query: " :count-query) (string :format "%v")))))
\r
118 +(defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox")
\r
119 + (:name "unread" :query "tag:unread"))
\r
120 + "A list of saved searches to display.
\r
122 +The saved search can be given in 3 forms. The preferred way is as
\r
123 +a plist. Supported properties are
\r
125 + :name Name of the search (required).
\r
126 + :query Search to run (required).
\r
127 + :count-query Optional extra query to generate the count
\r
128 + shown. If not present then the :query property
\r
131 +Other accepted forms are a cons cell of the form (NAME . QUERY)
\r
132 +or a list of the form (NAME QUERY COUNT-QUERY)."
\r
133 +;; The saved-search format is also used by the all-tags notmuch-hello
\r
134 +;; section. This section generates its own saved-search list in one of
\r
135 +;; the latter two forms.
\r
137 + :get 'notmuch--saved-searches-to-plist
\r
138 + :type '(repeat notmuch-saved-search-plist)
\r
139 + :tag "List of Saved Searches"
\r
140 :group 'notmuch-hello)
\r
142 (defcustom notmuch-archive-tags '("-inbox")
\r