[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116867: lisp/emacs-lisp/package-x.el: Follow-up
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs-24 r116867: lisp/emacs-lisp/package-x.el: Follow-up to change in package.el. |
Date: |
Thu, 27 Mar 2014 00:20:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116867
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-03-27 01:20:50 +0100
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/package-x.el packagex.el-20100617020707-ybavz666awsxwin6-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-03-26 15:21:17 +0000
+++ b/lisp/ChangeLog 2014-03-27 00:20:50 +0000
@@ -1,3 +1,8 @@
+2014-03-27 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* emacs-lisp/package.el: Fix bug#16733 (again).
=== modified file 'lisp/emacs-lisp/package-x.el'
--- a/lisp/emacs-lisp/package-x.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/package-x.el 2014-03-27 00:20:50 +0000
@@ -114,18 +114,12 @@
(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'"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116867: lisp/emacs-lisp/package-x.el: Follow-up to change in package.el.,
Juanma Barranquero <=