emacs-lisp/package.el: Don't overwrite downloads-in-progress.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a7d953a613717c24e00a7222b138d75a8d04c34..9b2b3121439f528de7388df7fbed98fcd7cacddf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-04  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+       * emacs-lisp/package.el (package--download-and-read-archives): Add
+       `package-archives' to `package--downloads-in-progress' instead of
+       overwriting it.
+
 2015-04-04  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-cache.el (tramp-flush-directory-property): Quote directory

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 583598ee10cc471539b8e910765cf62a1294d94d..3f7784032e4c50b6e616fc710cb74d300e110c4b 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1410,7 +1410,9 @@ This populates `package-archive-contents'.  If ASYNC is non-nil,
 perform the downloads asynchronously."
   ;; The downloaded archive contents will be read as part of
   ;; `package--update-downloads-in-progress'.
-  (setq package--downloads-in-progress package-archives)
+  (setq package--downloads-in-progress
+        (append package-archives
+                package--downloads-in-progress))
   (dolist (archive package-archives)
     (condition-case-unless-debug nil
         (package--download-one-archive archive "archive-contents" async)