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

(package--all-keywords): Deleted variable.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e45d79aa01d3354c709e1a9426ce5f874909f55a..f770acd557e3b2fa1ca2922110e8880db0479055 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -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.