emacs: drop support for deprecated notmuch-folders

Remove notmuch-folders which has been deprecated since

commit a466921760
Author: Carl Worth <cworth@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.
This commit is contained in:
Jani Nikula 2012-12-03 23:23:44 +02:00 committed by David Bremner
parent 7f54db1f04
commit fb6edb0800
2 changed files with 3 additions and 23 deletions

View file

@ -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*"))

View file

@ -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