Reduce doom-module-table calls significantly

This commit is contained in:
Henrik Lissner 2018-05-25 01:17:01 +02:00
parent 11705d0920
commit a390ef8deb
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -309,8 +309,7 @@ Use this before any of package.el, quelpa or Doom's package management's API to
ensure all the necessary package metadata is initialized and available for ensure all the necessary package metadata is initialized and available for
them." them."
(with-temp-buffer ; prevent buffer-local settings from propagating (with-temp-buffer ; prevent buffer-local settings from propagating
(let ((load-prefer-newer t) ; reduce stale code issues (let ((load-prefer-newer t)) ; reduce stale code issues
(doom-modules (doom-module-table)))
;; package.el and quelpa handle themselves if their state changes during ;; package.el and quelpa handle themselves if their state changes during
;; the current session, but if you change an packages.el file in a module, ;; the current session, but if you change an packages.el file in a module,
;; there's no non-trivial way to detect that, so we give you a way to ;; there's no non-trivial way to detect that, so we give you a way to
@ -338,6 +337,7 @@ them."
(error "Could not initialize quelpa")))) (error "Could not initialize quelpa"))))
(when (or force-p (not doom-packages)) (when (or force-p (not doom-packages))
(let ((doom-modules (doom-module-table)))
(setq doom-packages nil) (setq doom-packages nil)
(cl-flet (cl-flet
((_load ((_load
@ -357,7 +357,7 @@ them."
for path = (doom-module-path (car key) (cdr key) "packages.el") for path = (doom-module-path (car key) (cdr key) "packages.el")
do (let ((doom--current-module key)) (_load path t))) do (let ((doom--current-module key)) (_load path t)))
(cl-loop for dir in doom-psuedo-module-dirs (cl-loop for dir in doom-psuedo-module-dirs
do (_load (expand-file-name "packages.el" dir) t)))))))) do (_load (expand-file-name "packages.el" dir) t)))))))))
;; ;;