From 526e158afd21a3d7365b59334d4f9e2320cb3ea7 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 16 Apr 2014 22:21:52 +0100 Subject: [PATCH] [PATCH 0/1] emacs: hello: bugfix for saved searches defcustom --- 8c/b1e21bad47dda0a159cb074626c8ce8b43c367 | 113 ++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 8c/b1e21bad47dda0a159cb074626c8ce8b43c367 diff --git a/8c/b1e21bad47dda0a159cb074626c8ce8b43c367 b/8c/b1e21bad47dda0a159cb074626c8ce8b43c367 new file mode 100644 index 000000000..7af0df66f --- /dev/null +++ b/8c/b1e21bad47dda0a159cb074626c8ce8b43c367 @@ -0,0 +1,113 @@ +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 F0ABD431FBF + for ; Wed, 16 Apr 2014 14:22:11 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 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, + FREEMAIL_REPLY=2.499, 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 v59nXcKMxdeW for ; + Wed, 16 Apr 2014 14:22:06 -0700 (PDT) +Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com + [74.125.83.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 4593C431FAE for ; Wed, 16 Apr 2014 14:22:06 -0700 + (PDT) +Received: by mail-ee0-f41.google.com with SMTP id t10so9349399eei.0 + for ; Wed, 16 Apr 2014 14:22:03 -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; + bh=QUoywGNYjHkbmH+vgSdFaq69hGNI1keRKPgGFGJff8E=; + b=YPUA0G+LWE0jrszecFYZeePb4q+sOvJRXC/ZsRIJUIdaFKvvpQ6wfL4LMSmqXoaeEj + 0C7PNnuQVb63gBmei9BpA4lXxeNiCkCgogiLWY3V4YGPOg2aIrhwbDAd62slqrfM+SrS + Tucuw7YMPlc4WYsUKQmenDzRIUcs9BcLZEPtElMtpnYMwuwGThwBAa2KuP71VH9A5IF0 + Nn5ASlA7ldKby687ZG8PHx6fmLpkHrcaJxrVtaSxnruqdAvLMjrHkiGzGPLslE4ft8Au + lbXHC0tTxTJ5CRbylvrcgQUVexG3s95BRTUlDnP8MCM29dlmlqEuoT7+LAHAh08zamCd + eLzA== +X-Received: by 10.14.113.194 with SMTP id a42mr5611890eeh.115.1397683322685; + Wed, 16 Apr 2014 14:22:02 -0700 (PDT) +Received: from localhost ([217.17.137.178]) + by mx.google.com with ESMTPSA id n41sm61328141eeg.4.2014.04.16.14.22.01 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Wed, 16 Apr 2014 14:22:02 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 0/1] emacs: hello: bugfix for saved searches defcustom +Date: Wed, 16 Apr 2014 22:21:52 +0100 +Message-Id: <1397683313-28268-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +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: Wed, 16 Apr 2014 21:22:12 -0000 + +This is almost the same as id:1397627927-9692-1-git-send-email-markwalters1009@gmail.com but with a commit message a couple of function renames and a couple of spelling/typo mistakes fixed (pointed out by Tomi) + +The diff from the WIP version is: + +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index 27eac72..a7a8e20 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -56,7 +56,7 @@ lists (NAME QUERY COUNT-QUERY)." + "Return a copy of SAVED-SEARCH in plist form. + + If saved search is a plist then just return a copy. In other +-cases, for backwards compatability, convert to plist form and ++cases, for backwards compatibility, convert to plist form and + return that." + (if (keywordp (car saved-search)) + (copy-seq saved-search) +@@ -67,11 +67,11 @@ return that." + (when string + (setq plist-search (append plist-search (list field string))))))))) + +-(defun notmuch--saved-searches-to-plist (symbol) ++(defun notmuch-hello--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 ++compatibility 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))) +@@ -114,7 +114,7 @@ or a list of the form (NAME QUERY COUNT-QUERY)." + ;; section. This section generates its own saved-search list in one of + ;; the latter two forms. + +- :get 'notmuch--saved-searches-to-plist ++ :get 'notmuch-hello--saved-searches-to-plist + :type '(repeat notmuch-saved-search-plist) + :tag "List of Saved Searches" + :group 'notmuch-hello) + + +Mark Walters (1): + emacs: hello: bugfix for saved searches defcustom + + emacs/notmuch-hello.el | 128 ++++++++++++++++++++++++++++++++++-------------- + emacs/notmuch-lib.el | 52 -------------------- + 2 files changed, 90 insertions(+), 90 deletions(-) + +-- +1.7.10.4 + -- 2.26.2