From 13b0cac8e027fcaad0ce1823f20afd4b692161fa Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Tue, 13 Jul 2010 21:36:26 -0700 Subject: [PATCH 5/5] 2010-07-13 Phil Hagelberg * emacs-lisp/package.el: Remove references to ELPA, since we are no longer pointing at Tromey's archive. Update header comments --- lisp/emacs-lisp/package.el | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 63dab02..0f43fa6 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -43,9 +43,6 @@ ;; currently register any of these, so this feature does not actually ;; work.) -;; This code supports a single package repository, ELPA. All packages -;; must be registered there. - ;; A package is described by its name and version. The distribution ;; format is either a tar file or a single .el file. @@ -55,11 +52,13 @@ ;; which consists of a call to define-package. It may also contain a ;; "dir" file and the info files it references. -;; A .el file will be named "NAME-VERSION.el" in ELPA, but will be +;; A .el file will be named "NAME-VERSION.el" remotely but will be ;; installed as simply "NAME.el" in a directory named "NAME-VERSION". -;; The downloader will download all dependent packages. It will also -;; byte-compile the package's lisp at install time. +;; The downloader will download all dependent packages. By default +;; packages will come from the official GNU sources, but others may be +;; added by customizing the `package-archives' alist. Packages get +;; byte-compiled at install time. ;; At activation time we will set up the load-path and the info path, ;; and we will load the package's autoloads. If a package's @@ -67,9 +66,9 @@ ;; Conceptually a package has multiple state transitions: ;; -;; * Download. Fetching the package from ELPA. +;; * Download. Fetching the package from a remote archive source. ;; * Install. Untar the package, or write the .el file, into -;; ~/.emacs.d/elpa/ directory. +;; the package-user-dir. ;; * Byte compile. Currently this phase is done during install, ;; but we may change this. ;; * Activate. Evaluate the autoloads for the package to make it @@ -83,7 +82,8 @@ ;; packages. You can choose packages for install (mark with "i", ;; then "x" to execute) or deletion (not implemented yet), and you ;; can see what packages are available. This will automatically -;; fetch the latest list of packages from ELPA. +;; fetch the latest list of packages from the sources specified in +;; the package-archives alist. ;; ;; M-x package-list-packages-no-fetch ;; Like package-list-packages, but does not automatically fetch the @@ -1053,7 +1053,7 @@ Downloads the archive index from ARCHIVE and stores it in FILE." (kill-buffer buffer)))) (defun package-refresh-contents () - "Download the ELPA archive description if needed. + "Download the archive descriptions if needed. Invoking this will ensure that Emacs knows about the latest versions of all packages. This will let Emacs make them available for download." @@ -1229,7 +1229,7 @@ The variable `package-load-list' controls which packages to load." :help "Update the list of packages")) (define-key menu-map [mr] '(menu-item "Refresh package list" package-menu-refresh - :help "Download the ELPA archive")) + :help "Download the archive listings")) (define-key menu-map [s4] '("--")) (define-key menu-map [mt] '(menu-item "Mark obsolete packages" package-menu-mark-obsolete-for-deletion @@ -1273,7 +1273,7 @@ Letters do not insert themselves; instead, they are commands. (run-hooks 'package-menu-mode-hook))) (defun package-menu-refresh () - "Download the ELPA archive. + "Download the archive listings. This fetches the file describing the current contents of the Emacs Lisp Package Archive, and then refreshes the package menu. This lets you see what new packages are -- 1.7.0.4