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

Make load-env-vars a core package

Browse source 
Fixes a race condition where the load-env-vars package is used before it
was (or could be) installed.
This commit is contained in:
Henrik Lissner 2019-03-28 13:15:08 -04:00
parent 111b3758d4
commit eb1296387f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/core.el
View file

@ -450,11 +450,12 @@ to least)."
(unless (or force-p
(doom-initialize-autoloads doom-package-autoload-file)
noninteractive)
(user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them"))))
(user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them")))
;; Load shell environment
(when (file-readable-p doom-env-file)
(load-env-vars doom-env-file))
;; Load shell environment
(unless noninteractive
(when (file-readable-p doom-env-file)
(load-env-vars doom-env-file))))
(require 'core-lib)
(require 'core-modules)