Skip to content

fix: `man' not providing completion from the loaded environment #99

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: `man' not providing completion from the loaded environment #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aabc67e
feat: add option to disable envrc in minibuffer
Grimpper Dec 23, 2024
b91fada
fix: `man' not providing completion from the loaded environment
Grimpper Jan 10, 2025
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
15 changes: 14 additions & 1 deletion envrc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ Messages are written into the *envrc-debug* buffer."
:group 'envrc
:type 'boolean)

(defcustom envrc-disable-in-minibuffer nil
"Whether or not to load environments in the minibuffer.

A non-nil value will prevent the envrionment from propagating into the
minibuffer. Note that `completing-read' will not provide completion
using the new environment."
:group 'envrc
:type 'boolean)

(defcustom envrc-direnv-executable "direnv"
"The direnv executable used by envrc."
:type 'string)
Expand Down Expand Up @@ -154,7 +163,7 @@ e.g. (define-key envrc-mode-map (kbd \"C-c e\") \\='envrc-command-map)"
(lambda ()
(when
(cond
((minibufferp) nil)
((and (minibufferp) envrc-disable-in-minibuffer) nil)
((file-remote-p default-directory)
(and envrc-remote
(seq-contains-p
Expand Down Expand Up @@ -513,6 +522,10 @@ Shortcuts tramp caching direnv sets the exec-path."
(or envrc--remote-path
(apply fn vec nil))))

;; NOTE: since this function is meant to be invoked by `completing-read',
;; `envrc-mode' must be enabled in the minibuffer. This can be configured by
;; setting `envrc-disable-in-minibuffer' to nil.
(advice-add 'Man-completion-table :around #'envrc-propagate-environment)
(advice-add 'shell-command-to-string :around #'envrc-propagate-environment)
(advice-add 'async-shell-command :around #'envrc-propagate-environment)
(advice-add 'org-babel-eval :around #'envrc-propagate-environment)
Expand Down
Loading