Skip to content

move all pack loading into an 'after-init-hook, so ELPA packages are loaded prior to user packs #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cemerick wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move all pack loading into an 'after-init-hook, so ELPA packages are loaded prior to user packs #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions init.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,17 +156,6 @@
(message "%s" (concat "This is Emacs Live " live-version))
live-version))

;; Load `~/.emacs-live.el`. This allows you to override variables such
;; as live-packs (allowing you to specify pack loading order)
;; Does not load if running in safe mode
(let* ((pack-file (concat (file-name-as-directory "~") ".emacs-live.el")))
(if (and (file-exists-p pack-file) (not live-safe-modep))
(load-file pack-file)))

;; Load all packs - Power Extreme!
(mapcar (lambda (pack-dir)
(live-load-pack pack-dir))
(live-pack-dirs))

(setq live-welcome-messages
(if (live-user-first-name-p)
Expand Down Expand Up @@ -215,7 +204,29 @@
(if (not live-disable-zone)
(add-hook 'term-setup-hook 'zone))

(if (not custom-file)
(setq custom-file (concat live-custom-dir "custom-configuration.el")))
(when (file-exists-p custom-file)
(load custom-file))
;; perform all pack initialization after emacs itself is fully initialized,
;; i.e. all ELPA packages have been init'ed, load-path updated, etc.
(add-hook 'after-init-hook
(lambda ()
;; Load `~/.emacs-live.el`. This allows you to override variables such
;; as live-packs (allowing you to specify pack loading order)
;; Does not load if running in safe mode
(let* ((pack-file (concat (file-name-as-directory "~") ".emacs-live.el")))
(if (and (file-exists-p pack-file) (not live-safe-modep))
(load-file pack-file)))

;; Load all packs - Power Extreme!
(mapcar (lambda (pack-dir)
(live-load-pack pack-dir))
(live-pack-dirs))

(if (not custom-file)
(setq custom-file (concat live-custom-dir "custom-configuration.el")))
(when (file-exists-p custom-file)
(load custom-file))))