Refactor doom init

This commit is contained in:
Henrik Lissner 2017-07-14 18:19:52 +02:00
parent 6a5bd216e5
commit 233134a6da
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -170,21 +170,20 @@ ability to invoke the debugger in debug mode."
(require 'cl-lib) (require 'cl-lib)
(require 'core-packages (concat doom-core-dir "core-packages")) (require 'core-packages (concat doom-core-dir "core-packages"))
(load! core-lib))
(eval-when-compile (eval-when-compile
(doom-initialize)) (doom-initialize))
(setq load-path (eval-when-compile load-path)
doom--package-load-path (eval-when-compile doom--package-load-path))
(setq load-path (eval-when-compile load-path) (load! core-lib)
doom--package-load-path (eval-when-compile doom--package-load-path)) (load! core-os) ; consistent behavior across OSes
(condition-case-unless-debug ex
(load! core-os) ; consistent behavior across OSes (require 'autoloads doom-autoload-file t)
(condition-case-unless-debug ex ('error
(require 'autoloads doom-autoload-file t) (lwarn 'doom-autoloads :warning
('error "%s in autoloads.el -> %s"
(lwarn 'doom-autoloads :warning (car ex) (error-message-string ex)))))
"%s in autoloads.el -> %s"
(car ex) (error-message-string ex))))
(add-hook! '(emacs-startup-hook doom-reload-hook) (add-hook! '(emacs-startup-hook doom-reload-hook)
#'doom|finalize) #'doom|finalize)