From d1d0a7e258c7cf33e3037d8e37506c03063bd059 Mon Sep 17 00:00:00 2001 From: StrawberryTea Date: Thu, 1 Feb 2024 17:47:20 -0600 Subject: [PATCH] fix(eshell): remove fish executable advice Ref: LemonBreezes/emacs-fish-completion@99f0672c20ea --- modules/term/eshell/config.el | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index cf2beb9b2..af7633082 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -244,12 +244,5 @@ Emacs versions < 29." (use-package! fish-completion :unless IS-WINDOWS :hook (eshell-mode . fish-completion-mode) - :init (setq fish-completion-fallback-on-bash-p t) - :config - ;; HACK Even with `fish-completion-fallback-on-bash-p' non-nil, - ;; `fish-completion--list-completions-with-desc' will throw an error if - ;; fish isn't installed (and so, will fail to fall back to bash), so we - ;; advise it to fail silently. - (defadvice! +eshell--fallback-to-bash-a (&rest _) - :before-until #'fish-completion--list-completions-with-desc - (unless (executable-find "fish") ""))) + :init (setq fish-completion-fallback-on-bash-p t + fish-completion-inhibit-missing-fish-command-warning t))