Skip to content

Treat direnv-non-file-modes as possibly derived modes. #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wbolster merged 2 commits into from
Jun 19, 2019
Merged

Treat direnv-non-file-modes as possibly derived modes. #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ade291
Treat direnv-non-file-modes as possibly derived modes.
stribb Jun 19, 2019
92c5d44
Untabify direnv--directory
stribb Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions direnv.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ usually results in coloured output."
(defcustom direnv-non-file-modes '(eshell-mode dired-mode)
"List of modes where direnv will update even if the buffer has no file.

In these modes, direnv will use `default-directory' instead of
`(file-name-directory (buffer-file-name (current-buffer)))'."
In these modes, or modes derived from them, direnv will use
`default-directory'
instead of
`(file-name-directory (buffer-file-name (current-buffer)))'."
:group 'direnv
:type '(repeat (symbol :tag "Major mode")))

Expand All @@ -76,7 +78,7 @@ In these modes, direnv will use `default-directory' instead of
(let* ((buffer (or (buffer-base-buffer) (current-buffer)))
(file-name (buffer-file-name buffer)))
(cond (file-name (file-name-directory file-name))
((member major-mode direnv-non-file-modes) default-directory))))
((apply #'derived-mode-p direnv-non-file-modes) default-directory))))

(defun direnv--export (directory)
"Call direnv for DIRECTORY and return the parsed result."
Expand Down