From ceb1d4e91f5718e1610d3536ed394ac25e5251f4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 15 May 2020 22:53:17 -0400 Subject: [PATCH] Disable {bash,fish}-completion on Windows Because neither is available on windows, you'll get errors when trying to complete in eshell. Better to disable it so eshell can fall back to pcomplete. --- modules/term/eshell/config.el | 1 + modules/term/eshell/packages.el | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index 5445489aa..421a891df 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -180,6 +180,7 @@ You should use `set-eshell-alias!' to change this.") (use-package! fish-completion + :unless IS-WINDOWS :hook (eshell-mode . fish-completion-mode) :init (setq fish-completion-fallback-on-bash-p t) :config diff --git a/modules/term/eshell/packages.el b/modules/term/eshell/packages.el index 61da48f63..82bfc2281 100644 --- a/modules/term/eshell/packages.el +++ b/modules/term/eshell/packages.el @@ -7,6 +7,7 @@ (package! esh-help :pin "417673ed18a983930a66a6692dbfb288a995cb80") (package! eshell-did-you-mean :pin "7cb6ef8e2274d0a50a9e114d412307a6543533d5") -(when (featurep! :completion company) - (package! fish-completion :pin "10384881817b5ae38cf6197a077a663420090d2c") - (package! bash-completion :pin "96ce14af9674f3e605bacca87abc0c23b8f13cd5")) +(unless IS-WINDOWS + (when (featurep! :completion company) + (package! fish-completion :pin "10384881817b5ae38cf6197a077a663420090d2c") + (package! bash-completion :pin "96ce14af9674f3e605bacca87abc0c23b8f13cd5")))