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

Don't reload envvar file on doom/reload

Browse source 
Might address 'Device 1 not a termcap terminal device' errors
This commit is contained in:
Henrik Lissner 2021-06-06 11:52:49 -04:00
parent 47bce8856d
commit c92f486750
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/autoload/config.el
View file

@ -80,8 +80,9 @@ Runs `doom-after-reload-hook' afterwards."
;; In case doom/reload is run before incrementally loaded packages are loaded, ;; In case doom/reload is run before incrementally loaded packages are loaded,
;; which could cause odd load order issues. ;; which could cause odd load order issues.
(mapc #'require (cdr doom-incremental-packages)) (mapc #'require (cdr doom-incremental-packages))
(doom--if-compile (format "%S sync -e" doom-bin) (doom--if-compile (format "%S sync -E" doom-bin)
(let ((doom-reloading-p t)) (let ((doom-reloading-p t)
doom-env-file)
(doom-run-hooks 'doom-before-reload-hook) (doom-run-hooks 'doom-before-reload-hook)
(doom-initialize 'force) (doom-initialize 'force)
(with-demoted-errors "PRIVATE CONFIG ERROR: %s" (with-demoted-errors "PRIVATE CONFIG ERROR: %s"

5
core/core.el
View file

@ -646,8 +646,9 @@ to least)."
;; Load shell environment, optionally generated from 'doom env'. No need ;; Load shell environment, optionally generated from 'doom env'. No need
;; to do so if we're in terminal Emacs, where Emacs correctly inherits ;; to do so if we're in terminal Emacs, where Emacs correctly inherits
;; your shell environment. ;; your shell environment.
(if (or (display-graphic-p) (if (and (or (display-graphic-p)
(daemonp)) (daemonp))
doom-env-file)
(doom-load-envvars-file doom-env-file 'noerror)) (doom-load-envvars-file doom-env-file 'noerror))
;; Loads `use-package' and all the helper macros modules (and users) can use ;; Loads `use-package' and all the helper macros modules (and users) can use