Don't reload envvar file on doom/reload
Might address 'Device 1 not a termcap terminal device' errors
This commit is contained in:
parent
47bce8856d
commit
c92f486750
2 changed files with 6 additions and 4 deletions
|
@ -80,8 +80,9 @@ Runs `doom-after-reload-hook' afterwards."
|
|||
;; In case doom/reload is run before incrementally loaded packages are loaded,
|
||||
;; which could cause odd load order issues.
|
||||
(mapc #'require (cdr doom-incremental-packages))
|
||||
(doom--if-compile (format "%S sync -e" doom-bin)
|
||||
(let ((doom-reloading-p t))
|
||||
(doom--if-compile (format "%S sync -E" doom-bin)
|
||||
(let ((doom-reloading-p t)
|
||||
doom-env-file)
|
||||
(doom-run-hooks 'doom-before-reload-hook)
|
||||
(doom-initialize 'force)
|
||||
(with-demoted-errors "PRIVATE CONFIG ERROR: %s"
|
||||
|
|
|
@ -646,8 +646,9 @@ to least)."
|
|||
;; Load shell environment, optionally generated from 'doom env'. No need
|
||||
;; to do so if we're in terminal Emacs, where Emacs correctly inherits
|
||||
;; your shell environment.
|
||||
(if (or (display-graphic-p)
|
||||
(daemonp))
|
||||
(if (and (or (display-graphic-p)
|
||||
(daemonp))
|
||||
doom-env-file)
|
||||
(doom-load-envvars-file doom-env-file 'noerror))
|
||||
|
||||
;; Loads `use-package' and all the helper macros modules (and users) can use
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue