From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 16 Oct 2015 22:54:38 +0000 (+0100)
Subject: * emacs-lisp/package.el: Reload archive-contents if priorities change
X-Git-Tag: emacs-25.0.90~1102
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8868b834022379f81268b387363cd6a3ff1214b4;p=emacs.git

* emacs-lisp/package.el: Reload archive-contents if priorities change

(package--old-archive-priorities): New variable.
(package-read-all-archive-contents, package-menu--refresh): Use it
to decide when the `package-archive-contents' needs to be read
again.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 89f2a1a011b..2dbcdf64940 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1364,10 +1364,18 @@ If the archive version is too new, signal an error."
       (dolist (package contents)
         (package--add-to-archive-contents package archive)))))
 
+(defvar package--old-archive-priorities nil
+  "Store currently used `package-archive-priorities'.
+This is the value of `package-archive-priorities' last time
+`package-read-all-archive-contents' was called.  It can be used
+by arbitrary functions to decide whether it is necessary to call
+it again.")
+
 (defun package-read-all-archive-contents ()
   "Re-read `archive-contents', if it exists.
 If successful, set `package-archive-contents'."
   (setq package-archive-contents nil)
+  (setq package--old-archive-priorities package-archive-priorities)
   (dolist (archive package-archives)
     (package-read-archive-contents (car archive))))
 
@@ -2675,6 +2683,8 @@ KEYWORDS should be nil or a list of keywords."
             (push pkg info-list)))))
 
     ;; Available and disabled packages:
+    (unless (equal package--old-archive-priorities package-archive-priorities)
+      (package-read-all-archive-contents))
     (dolist (elt package-archive-contents)
       (let ((name (car elt)))
         ;; To be displayed it must be in PACKAGES;