Properly disable direnv when direnv-mode is disabled

This commit is contained in:
Henrik Lissner
2020-01-25 17:06:47 -05:00
parent 8aec15c287
commit 6758110a25

View File

@ -17,9 +17,9 @@ when the file is first opened/major mode is activated. This is significantly
less expensive, but is less sensitive to changes to .envrc done outside of less expensive, but is less sensitive to changes to .envrc done outside of
Emacs." Emacs."
(direnv--disable) (direnv--disable)
(when direnv-mode (funcall (if direnv-mode 'add-hook 'remove-hook)
(add-hook 'after-change-major-mode-hook 'after-change-major-mode-hook
#'direnv--maybe-update-environment)))) #'direnv--maybe-update-environment)))
(defadvice! +direnv--make-process-environment-buffer-local-a (items) (defadvice! +direnv--make-process-environment-buffer-local-a (items)
:filter-return #'direnv--export :filter-return #'direnv--export