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

Improve general error handling at startup

Browse source 
This will hopefully reveal more information as to the cause and origin
of errors at startup. It should also make doom-debug-mode more likely to
produce a backtrace in non-interactive sessions.
This commit is contained in:
Henrik Lissner 2018-06-18 14:47:36 +02:00
parent c8aba6f552
commit ab07e07352
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 87 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/core-modules.el
View file

@ -27,6 +27,10 @@ A warning will be put out if these deprecated modules are used.")
;; Bootstrap API
;;
;; Custom errors
(define-error 'doom-autoload-error "Error in your autoloads file(s)" 'doom-error)
(define-error 'doom-private-error "Error in your private config" 'doom-error)
(defun doom-initialize-modules (&optional force-p)
"Loads the init.el in `doom-private-dir' and sets up hooks for a healthy
session of Dooming. Will noop if used more than once, unless FORCE-P is
@ -36,16 +40,19 @@ non-nil."
;; recurse by accident if any of them need `doom-initialize-modules'.
(setq doom-init-modules-p t)
(when doom-private-dir
(load (expand-file-name "init" doom-private-dir)
'noerror 'nomessage))))
(condition-case e
(load (expand-file-name "init" doom-private-dir)
'noerror 'nomessage)
(error (signal 'doom-private-error (list 'init e)))))))
(defun doom-initialize-autoloads (file)
"Tries to load FILE (an autoloads file). Return t on success, nil otherwise."
(condition-case-unless-debug e
(condition-case e
(load (file-name-sans-extension file) 'noerror 'nomessage)
('error
(message "Autoload error: %s -> %s"
(car e) (error-message-string e)))))
(if noninteractive
(message "Autoload file warning: %s -> %s" (car e) (error-message-string e))
(signal 'doom-autoload-error e)))))
;;
@ -289,13 +296,15 @@ to least)."
`(let (file-name-handler-alist)
(setq doom-modules ',doom-modules)
,@(nreverse init-forms)
(run-hooks 'doom-init-hook)
(run-hook-wrapped 'doom-init-hook #'doom-try-run-hook)
(unless noninteractive
(let ((doom--stage 'config))
,@(nreverse config-forms)
(when doom-private-dir
(load ,(expand-file-name "config" doom-private-dir)
t (not doom-debug-mode))))))))
(condition-case e
(load ,(expand-file-name "config" doom-private-dir)
t (not doom-debug-mode))
(error (signal 'doom-private-error (list 'config e))))))))))
(defvar doom-disabled-packages)
(defmacro def-package! (name &rest plist)