diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-06-16 22:08:10 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-06-16 22:08:10 -0400 |
| commit | 44198b6ee97bcb0ac88a5cadd1bf9b62048d0156 (patch) | |
| tree | 0815c0c51f4e30ae884c17d92f822042c662b658 /lisp/startup.el | |
| parent | e20f04215a264939f74306fa7a29deb97bad3f1c (diff) | |
| download | emacs-44198b6ee97bcb0ac88a5cadd1bf9b62048d0156.tar.gz | |
Merge package.el, written by Tom Tromey <tromey@redhat.com>.
Changes relative to version 0.9 of package.el are listed below:
* emacs-lisp/package-x.el: New file. Package uploading
functionality split out from package.el.
* emacs-lisp/package.el (package-archive-base): Point to
elpa.gnu.org.
(package-enable, package-load-list): New defcustoms.
(package-user-dir, package-directory-list): Turn into defcustoms.
Don't include package-user-dir in package-directory-list.
(package--builtins-base): Don't include Emacs as a "package".
(package-subdirectory-regexp): New var.
(package-load-all-descriptors, package-compute-transaction)
(package-download-transaction): Obey package-load-list.
(package-activate-1): Rename from package-do-activate.
(package-list-packages-internal): Check package-load-list.
(package-load-descriptor, package-generate-autoloads)
(package-unpack, package-unpack-single)
(package--read-archive-file, package-delete): Use
expand-file-name.
* startup.el (command-line): Load packages after reading init
file.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 87f1a00bd54..71857076d4f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1166,6 +1166,9 @@ the `--debug-init' option to view a complete error backtrace." (eq face-ignored-fonts old-face-ignored-fonts)) (clear-face-cache))) + ;; Load ELPA packages. + (and user-init-file package-enable-at-startup (package-initialize)) + (setq after-init-time (current-time)) (run-hooks 'after-init-hook) |