Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

1 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6a79c7dea6..33e14568376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,11 @@
         * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
         (browse-url-firefox-arguments)
         (browse-url-firefox-startup-arguments): Doc fix.
+2015-04-05  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+        * emacs-lisp/package.el: Add package-initialize to user-init-file.
+        (package--ensure-init-file): New function.
+        (package-install, package-install-from-buffer): Use it.
 
 2015-04-05  Pete Williamson  <petewil@chromium.org>  (tiny-change)
 
@@ -28,6 +33,9 @@
         `package-archives' to `package--downloads-in-progress' instead of
         overwriting it.
         (package--with-work-buffer-async): Protect macro arguments.
+        (package--download-one-archive)
+        (package--download-and-read-archives): Prevent
+        downloads-in-progress list from becoming outdated.
 
 2015-04-04  Michael Albinus  <michael.albinus@gmx.de>