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

Soft-fail if doom-module-table can't find your private init.el

Browse source
This commit is contained in:
Henrik Lissner 2018-05-25 01:11:53 +02:00
parent 9a8b6a82e2
commit 59f70c2a87
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/core-packages.el
View file

@ -465,16 +465,17 @@ added, if the file exists."
:size (if modules (length modules) 100) :size (if modules (length modules) 100)
:rehash-threshold 1.0))) :rehash-threshold 1.0)))
(when (null modules) (when (null modules)
(let ((init-file (expand-file-name "init.el" doom-private-dir))) (let ((init-file (expand-file-name "init.el" doom-private-dir))
(short-init-file (abbreviate-file-name init-file)))
(if (not (file-exists-p init-file)) (if (not (file-exists-p init-file))
(error "%s doesn't exist" (abbreviate-file-name init-file)) (warn "%s doesn't exist" short-init-file)
(with-temp-buffer (with-temp-buffer
(insert-file-contents init-file) (insert-file-contents init-file)
(when (re-search-forward "^\\s-*\\((doom! \\)" nil t) (when (re-search-forward "^\\s-*\\((doom! \\)" nil t)
(goto-char (match-beginning 1)) (goto-char (match-beginning 1))
(setq modules (cdr (sexp-at-point)))))) (setq modules (cdr (sexp-at-point))))))
(unless modules (unless (or modules noninteractive)
(error "Couldn't gather module list from %s" init-file)))) (warn "Couldn't gather module list from %s" short-init-file))))
(if (eq modules t) (setq modules nil)) (if (eq modules t) (setq modules nil))
(let (category) (let (category)
(dolist (m modules) (dolist (m modules)