Commit 864573ca authored by Artur Malabarba's avatar Artur Malabarba

* lisp/emacs-lisp/package.el (package-all-keywords): Don't cache

(package--all-keywords): Deleted variable.
parent f8d66028
......@@ -1373,11 +1373,6 @@ it to the file."
(defvar package--downloads-in-progress nil
"List of in-progress asynchronous downloads.")
(defvar package--all-keywords nil
"List of known keywords.
Generated by `package-all-keywords'. Reset to nil whenever the
package archives are retrieved.")
(declare-function epg-check-configuration "epg-config"
(config &optional minimum-version))
(declare-function epg-configuration "epg-config" ())
......@@ -1495,7 +1490,6 @@ downloads in the background."
(interactive)
(unless (file-exists-p package-user-dir)
(make-directory package-user-dir t))
(setq package--all-keywords nil)
(let ((default-keyring (expand-file-name "package-keyring.gpg"
data-directory))
(package--silence async))
......@@ -2570,11 +2564,11 @@ KEYWORDS should be nil or a list of keywords."
(defun package-all-keywords ()
"Collect all package keywords"
(unless package--all-keywords
(let ((key-list))
(package--mapc (lambda (desc)
(let* ((desc-keywords (and desc (package-desc--keywords desc))))
(setq package--all-keywords (append desc-keywords package--all-keywords))))))
package--all-keywords)
(setq key-list (append (package-desc--keywords desc)
key-list))))
key-list))
(defun package--mapc (function &optional packages)
"Call FUNCTION for all known PACKAGES.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment