diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-29 12:01:14 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-29 12:01:14 -0400 |
| commit | 063e52940d4d97fe372f226c895d6d0f9d87f5d4 (patch) | |
| tree | b08402714b51509bcc0bd6561ed46e5c61c11405 /lisp/emacs-lisp/package.el | |
| parent | 26469a38e110614fd3ea603f0b6ee2ab6d27a3be (diff) | |
| download | emacs-063e52940d4d97fe372f226c895d6d0f9d87f5d4.tar.gz | |
Update package-x to latest package.el changes.
* emacs-lisp/package-x.el (package--make-rss-entry):
(package-maint-add-news-item, package--update-news)
(package-upload-buffer-internal): New arg ARCHIVE-URL.
* emacs-lisp/package.el (package-archive-url): Rename from
package-archive-id.
(package-install): Doc fix.
(package-download-single, package-download-tar, package-install)
(package-menu-view-commentary): Callers changed.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 6470d345dff..73434a1717b 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -685,7 +685,7 @@ It will move point to somewhere in the headers." (defun package-download-single (name version desc requires) "Download and install a single-file package." (let ((buffer (url-retrieve-synchronously - (concat (package-archive-id name) + (concat (package-archive-url name) (symbol-name name) "-" version ".el")))) (with-current-buffer buffer (package-handle-response) @@ -698,7 +698,7 @@ It will move point to somewhere in the headers." (defun package-download-tar (name version) "Download and install a tar package." (let ((tar-buffer (url-retrieve-synchronously - (concat (package-archive-id name) + (concat (package-archive-url name) (symbol-name name) "-" version ".tar")))) (with-current-buffer tar-buffer (package-handle-response) @@ -856,7 +856,7 @@ Also, add the originating archive to the end of the package vector." (defun package-install (name) "Install the package named NAME. Interactively, prompt for the package name. -The package is found on one of the archives in `package-archive-base'." +The package is found on one of the archives in `package-archives'." (interactive (list (intern (completing-read "Install package: " (mapcar (lambda (elt) @@ -1030,7 +1030,7 @@ The file can either be a tar file or an Emacs Lisp file." ;; FIXME: query user? 'always)) -(defun package-archive-id (name) +(defun package-archive-url (name) "Return the archive containing the package NAME." (let ((desc (cdr (assq (intern-soft name) package-archive-contents)))) (cdr (assoc (aref desc (- (length desc) 1)) package-archives)))) @@ -1350,7 +1350,7 @@ For larger packages, shows the README file." (interactive) (let* ((pkg-name (package-menu-get-package)) (buffer (url-retrieve-synchronously - (concat (package-archive-id pkg-name) + (concat (package-archive-url pkg-name) pkg-name "-readme.txt"))) start-point ok) |