From 7488b51e9aa203ecdabfb71a14236b88d64b43d0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 29 Mar 2019 01:51:36 -0400 Subject: [PATCH] Prevent void-function load-env-vars errors In case load-env-vars hasn't been autoloaded yet. --- core/core.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core.el b/core/core.el index 0a75a04fc..1ed09ef2d 100644 --- a/core/core.el +++ b/core/core.el @@ -453,9 +453,10 @@ to least)." (user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them"))) ;; Load shell environment - (unless noninteractive - (when (file-readable-p doom-env-file) - (load-env-vars doom-env-file)))) + (when (and (not noninteractive) + (file-readable-p doom-env-file) + (require 'load-env-vars nil t)) + (load-env-vars doom-env-file))) (require 'core-lib) (require 'core-modules)