diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a7d953a613..9b2b3121439 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-04-04 Artur Malabarba <bruce.connor.am@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package--download-and-read-archives): Add | ||
| 4 | `package-archives' to `package--downloads-in-progress' instead of | ||
| 5 | overwriting it. | ||
| 6 | |||
| 1 | 2015-04-04 Michael Albinus <michael.albinus@gmx.de> | 7 | 2015-04-04 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 8 | ||
| 3 | * net/tramp-cache.el (tramp-flush-directory-property): Quote directory | 9 | * 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 583598ee10c..3f7784032e4 100644 --- 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, | |||
| 1410 | perform the downloads asynchronously." | 1410 | perform the downloads asynchronously." |
| 1411 | ;; The downloaded archive contents will be read as part of | 1411 | ;; The downloaded archive contents will be read as part of |
| 1412 | ;; `package--update-downloads-in-progress'. | 1412 | ;; `package--update-downloads-in-progress'. |
| 1413 | (setq package--downloads-in-progress package-archives) | 1413 | (setq package--downloads-in-progress |
| 1414 | (append package-archives | ||
| 1415 | package--downloads-in-progress)) | ||
| 1414 | (dolist (archive package-archives) | 1416 | (dolist (archive package-archives) |
| 1415 | (condition-case-unless-debug nil | 1417 | (condition-case-unless-debug nil |
| 1416 | (package--download-one-archive archive "archive-contents" async) | 1418 | (package--download-one-archive archive "archive-contents" async) |