[PATCH] emacs: drop support for deprecated notmuch-folders
Austin Clements
amdragon at MIT.EDU
Mon Dec 3 14:13:14 PST 2012
LGTM. It's probably more reliable, too, since there are places where
we reference notmuch-saved-searches (the variable) directly that may
not pass through notmuch-hello first.
Quoth Jani Nikula on Dec 03 at 11:23 pm:
> Remove notmuch-folders which has been deprecated since
>
> commit a4669217600e4536dc0c49f0255af5e2d9bc183f
> Author: Carl Worth <cworth at cworth.org>
> Date: Mon Apr 26 22:42:07 2010 -0700
>
> emacs: Rip out all of the notmuch-folder code.
>
> This lets us simplify the notmuch-saved-searches code slightly.
> ---
> emacs/notmuch-hello.el | 7 +------
> emacs/notmuch-lib.el | 19 ++-----------------
> 2 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
> index be50aae..6db62a0 100644
> --- a/emacs/notmuch-hello.el
> +++ b/emacs/notmuch-hello.el
> @@ -689,7 +689,7 @@ following:
> "Show an entry for each saved search and inboxed messages for each tag"
> (notmuch-hello-insert-searches "What's in your inbox"
> (append
> - (notmuch-saved-searches)
> + notmuch-saved-searches
> (notmuch-hello-generate-tag-alist))
> :filter "tag:inbox"))
>
> @@ -726,11 +726,6 @@ following:
> "Run notmuch and display saved searches, known tags, etc."
> (interactive)
>
> - ;; Jump through a hoop to get this value from the deprecated variable
> - ;; name (`notmuch-folders') or from the default value.
> - (unless notmuch-saved-searches
> - (setq notmuch-saved-searches (notmuch-saved-searches)))
> -
> (if no-display
> (set-buffer "*notmuch-hello*")
> (switch-to-buffer "*notmuch-hello*"))
> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> index 1d0ec17..3e8647d 100644
> --- a/emacs/notmuch-lib.el
> +++ b/emacs/notmuch-lib.el
> @@ -77,7 +77,8 @@
> (defvar notmuch-search-history nil
> "Variable to store notmuch searches history.")
>
> -(defcustom notmuch-saved-searches nil
> +(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)
> :group 'notmuch-hello)
> @@ -96,22 +97,6 @@ For example, if you wanted to remove an \"inbox\" tag and add an
> :group 'notmuch-search
> :group 'notmuch-show)
>
> -(defvar notmuch-folders nil
> - "Deprecated name for what is now known as `notmuch-saved-searches'.")
> -
> -(defun notmuch-saved-searches ()
> - "Common function for querying the notmuch-saved-searches variable.
> -
> -We do this as a function to support the old name of the
> -variable (`notmuch-folders') as well as for the default value if
> -the user hasn't set this variable with the old or new value."
> - (if notmuch-saved-searches
> - notmuch-saved-searches
> - (if notmuch-folders
> - notmuch-folders
> - '(("inbox" . "tag:inbox")
> - ("unread" . "tag:unread")))))
> -
> (defun notmuch-version ()
> "Return a string with the notmuch version number."
> (let ((long-string
More information about the notmuch
mailing list