emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor refactor/reformatting of doom-initialize

Browse source 
- No need to use after! (it has a little magic associated with it that are
  meaningless this early in the startup process), so we use
  with-eval-after-load instead.

(And I've been itching for an excuse to use doom-rpartial)
This commit is contained in:
Henrik Lissner 2019-07-26 20:07:48 +02:00
parent a10693886e
commit 08ba22c653
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/core.el
View file

@ -519,20 +519,24 @@ to least)."
(if (and core-autoloads-p (not force-p)) (if (and core-autoloads-p (not force-p))
;; In case we want to use package.el or straight via M-x ;; In case we want to use package.el or straight via M-x
(progn (progn
(after! (:or package straight) (with-eval-after-load 'package
(require 'core-packages)) (require 'core-packages))
(after! straight (with-eval-after-load 'straight
(require 'core-packages)
(doom-initialize-packages))) (doom-initialize-packages)))
;; Eagerly load these libraries because this module may be loaded in a session ;; Eagerly load these libraries because this module may be loaded in a session
;; that hasn't been fully initialized (where autoloads files haven't been ;; that hasn't been fully initialized (where autoloads files haven't been
;; generated or `load-path' populated). ;; generated or `load-path' populated).
(let ((default-directory doom-core-dir)) (let ((default-directory doom-core-dir))
(dolist (file (file-expand-wildcards "autoload/*.el")) (mapc (doom-rpartial #'load 'noerror 'nomessage)
(load file t t))) (file-expand-wildcards "autoload/*.el")))
;; Create all our core directories to quell file errors ;; Create all our core directories to quell file errors
(dolist (dir (list doom-local-dir doom-etc-dir doom-cache-dir doom-elpa-dir)) (dolist (dir (list doom-local-dir
doom-etc-dir
doom-cache-dir
doom-elpa-dir))
(unless (file-directory-p dir) (unless (file-directory-p dir)
(make-directory dir 'parents))) (make-directory dir 'parents)))