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