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

Refactor doom-initialize; error handling for faulty autoloads

Browse source
This commit is contained in:
Henrik Lissner 2018-05-16 10:38:45 +02:00
parent 3e6d7f174a
commit 377e8a7b3c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/core-packages.el
View file

@ -198,8 +198,6 @@ FORCE-P is non-nil, do it anyway.
(require 'subr-x)
(require 'cl-lib)
(require 'map))
(cl-pushnew doom-core-dir load-path :test #'string=)
(require 'core-lib)
(when (or force-p (not doom-init-p))
;; packages.el cache
(when (and force-p (file-exists-p doom-packages-file))
@ -234,15 +232,20 @@ FORCE-P is non-nil, do it anyway.
(error "✕ Couldn't install %s" package)))
(message "Installing core packages...done"))))
;; autoloads file
(unless (quiet! (load doom-autoload-file 'noerror 'nomessage 'nosuffix))
(unless
(with-demoted-errors "Autoload error: %s"
(let (byte-compile-warnings)
(load doom-autoload-file 'noerror 'nomessage 'nosuffix)))
(unless noninteractive
(error "No autoloads file! Run make autoloads"))))
(error "No autoloads file! Run make autoloads")))
(cl-pushnew doom-core-dir load-path :test #'string=))
;; initialize Doom core
(require 'core-os)
(unless (or doom-init-p noninteractive)
(require 'core-lib)
(unless noninteractive
(unless doom-init-p
;; Cache important packages.el state
(doom|refresh-cache))
(unless noninteractive
(require 'core-ui)
(require 'core-editor)
(require 'core-projects)