From 6babccb71a66c0b34a104a22bd08b5fe4871a877 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 5 Apr 2014 22:24:23 +0100 Subject: [PATCH] [PATCH 3/5] emacs: hello: add a customize for saved-searches --- d4/4f1a31a30437f70a265f62823c1198b0c3bfdd | 127 ++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 d4/4f1a31a30437f70a265f62823c1198b0c3bfdd diff --git a/d4/4f1a31a30437f70a265f62823c1198b0c3bfdd b/d4/4f1a31a30437f70a265f62823c1198b0c3bfdd new file mode 100644 index 000000000..702bdb76b --- /dev/null +++ b/d4/4f1a31a30437f70a265f62823c1198b0c3bfdd @@ -0,0 +1,127 @@ +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 CEA91431FC2 + for ; Sat, 5 Apr 2014 14:24:58 -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 aLH3IPNpUoMq for ; + Sat, 5 Apr 2014 14:24:53 -0700 (PDT) +Received: from mail-we0-f176.google.com (mail-we0-f176.google.com + [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C44CC431FC3 + for ; Sat, 5 Apr 2014 14:24:50 -0700 (PDT) +Received: by mail-we0-f176.google.com with SMTP id x48so5056655wes.35 + for ; Sat, 05 Apr 2014 14:24:48 -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=OIX2HI1RzuxQSZRHS8hPo0y7kEXV3whS61/9YslX3ZY=; + b=TquhYwHVY5vaF4/+DYJFWkbAaChkoLWjYWE1emercQg3CnAbGdV2K2vvCp4+Vy5hhU + ussHjDm13LwphSuD49pghnljW/bNC1jGdibXJD6h5fmG/4nK+iriplMYp5njOOJs0GYY + uwt5vog6lRvjvea0VWC11Ks26L3NFUAbdhLmQ/vdcaLdjGrNeU2kkbt81aUQAkbfjjAJ + vkxj3TaKXayETusqtyj8ayrkTSdmppUBzmf5uJ08plq49UI3jJiuI2qfQiy0xrhn55uK + IQdir6LbY6h5389XM1Dzaf1wNDqOOSeQ2phQE3hgBEsom2Ut9KgBcu+SKtfKBZJ1XvfT + C8Lg== +X-Received: by 10.194.81.164 with SMTP id b4mr30723501wjy.2.1396733088260; + Sat, 05 Apr 2014 14:24:48 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id mw3sm13060411wic.7.2014.04.05.14.24.47 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 05 Apr 2014 14:24:47 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 3/5] emacs: hello: add a customize for saved-searches +Date: Sat, 5 Apr 2014 22:24:23 +0100 +Message-Id: <1396733065-32602-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1396733065-32602-1-git-send-email-markwalters1009@gmail.com> +References: <1396733065-32602-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, 05 Apr 2014 21:24:59 -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 | 28 +++++++++++++++++++++++++--- + 2 files changed, 26 insertions(+), 4 deletions(-) + +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index 733208b..c729af2 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -324,7 +324,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..8a12f91 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -107,10 +107,32 @@ (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")) ++(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." +- :type '(alist :key-type string :value-type string) ++ :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 + -- 2.26.2