Update doom doctor

This commit is contained in:
Henrik Lissner 2018-05-14 21:00:20 +02:00
parent 5537f81e02
commit dbeb7c639a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -279,16 +279,11 @@
(message "\n----") (message "\n----")
(let (doom-core-packages doom-debug-mode) (let (doom-core-packages doom-debug-mode)
(condition-case ex (condition-case ex
(progn (let ((inhibit-message t))
(load "~/.emacs.d/core/core.el" nil t)
(let (noninteractive) (let (noninteractive)
(load "~/.emacs.d/core/core.el" nil t))
(let ((inhibit-message t)
(noninteractive t))
(load "~/.emacs.d/init.el" nil t))
(doom-initialize t) (doom-initialize t)
(doom-initialize-packages t) (doom|finalize))
(quiet! (doom-initialize-modules))
(doom|finalize)
(success! "Attempt to load DOOM: success! Loaded v%s" doom-version)) (success! "Attempt to load DOOM: success! Loaded v%s" doom-version))
('error ('error
(warn! "Attempt to load DOOM: failed\n %s\n" (warn! "Attempt to load DOOM: failed\n %s\n"
@ -307,11 +302,13 @@
doom-packages) doom-packages)
(when (or (file-exists-p doctor-file) (when (or (file-exists-p doctor-file)
(file-exists-p packages-file)) (file-exists-p packages-file))
(let ((prefix (format "%s" (color 1 "(%s %s) " (car key) (cdr key))))) (let ((prefix (format "%s" (color 1 "(%s %s) " (car key) (cdr key))))
(doom--stage 'packages))
(when (load packages-file t t) (when (load packages-file t t)
(dolist (package (cl-remove-if #'package-installed-p doom-packages :key #'car)) (dolist (package (cl-remove-if #'package-installed-p doom-packages :key #'car))
(error! "%s is not installed" (car package)))) (error! "%s is not installed" (car package))))
(load doctor-file t t)))) (let ((doom--stage 'doctor))
(load doctor-file t t)))))
('error ('error
(error! "Syntax error: %s" ex)))) (error! "Syntax error: %s" ex))))
doom-modules))) doom-modules)))