lisp/emacs-lisp/package-x.el: Follow-up to change in package.el.

(package--archive-contents-from-url): Use url-insert-file-contents;
package-handle-response no longer exists.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 468e83f4218be9b0c3cf6cfb4d9a13d52457c279..b0e3f041ec2a1bd37ea17451e056b0af607d17cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs-lisp/package-x.el (package--archive-contents-from-url):
+       Use url-insert-file-contents; package-handle-response no longer exists.
+
 2014-03-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacs-lisp/package.el: Fix bug#16733 (again).

diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 6a6a62dc91669a99988cd7e6d1fe9fb0cc154d95..1d9d1a04668a965082f782ca022c5d233c9bece3 100644 (file)
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -114,18 +114,12 @@ inserted after its first occurrence in the file."
 (defun package--archive-contents-from-url (archive-url)
   "Parse archive-contents file at ARCHIVE-URL.
 Return the file contents, as a string, or nil if unsuccessful."
-  (ignore-errors
-    (when archive-url
-      (let* ((buffer (url-retrieve-synchronously
-                     (concat archive-url "archive-contents"))))
-       (set-buffer buffer)
-       (package-handle-response)
-       (re-search-forward "^$" nil 'move)
-       (forward-char)
-       (delete-region (point-min) (point))
-       (prog1 (package-read-from-string
-               (buffer-substring-no-properties (point-min) (point-max)))
-         (kill-buffer buffer))))))
+  (when archive-url
+    (with-temp-buffer
+      (ignore-errors
+       (url-insert-file-contents (concat archive-url "archive-contents"))
+       (package-read-from-string
+        (buffer-substring-no-properties (point-min) (point-max)))))))
 
 (defun package--archive-contents-from-file ()
   "Parse the archive-contents at `package-archive-upload-base'"