Fixes from PR feedback
This contains fixes suggested by Henrik as feedback from the initial PR, including updating and correcting the Eshell module README, and few tweaks to the module configuration, and properly pinning eshell-did-you-mean.
This commit is contained in:
parent
73de701073
commit
85cf7a794b
4 changed files with 17 additions and 12 deletions
|
@ -10,7 +10,7 @@
|
||||||
company-tooltip-align-annotations t
|
company-tooltip-align-annotations t
|
||||||
company-require-match 'never
|
company-require-match 'never
|
||||||
company-global-modes
|
company-global-modes
|
||||||
'(not erc-mode message-mode help-mode gud-mode eshell-mode)
|
'(not erc-mode message-mode help-mode gud-mode)
|
||||||
company-backends '(company-capf)
|
company-backends '(company-capf)
|
||||||
company-frontends '(company-pseudo-tooltip-frontend
|
company-frontends '(company-pseudo-tooltip-frontend
|
||||||
company-echo-metadata-frontend))
|
company-echo-metadata-frontend))
|
||||||
|
|
|
@ -1,9 +1,17 @@
|
||||||
#+TITLE: term/eshell
|
#+TITLE: term/eshell
|
||||||
#+DATE: April 17, 2020
|
#+DATE: May 18, 2020
|
||||||
#+SINCE: {replace with next tagged release version}
|
#+SINCE: v2.0
|
||||||
#+STARTUP: inlineimages nofold
|
#+STARTUP: inlineimages nofold
|
||||||
|
|
||||||
* Table of Contents :TOC_3:noexport:
|
* Table of Contents :TOC_3:noexport:
|
||||||
|
- [[#description][Description]]
|
||||||
|
- [[#maintainers][Maintainers]]
|
||||||
|
- [[#module-flags][Module Flags]]
|
||||||
|
- [[#plugins][Plugins]]
|
||||||
|
- [[#prerequisites][Prerequisites]]
|
||||||
|
- [[#features][Features]]
|
||||||
|
- [[#configuration][Configuration]]
|
||||||
|
- [[#troubleshooting][Troubleshooting]]
|
||||||
|
|
||||||
* Description
|
* Description
|
||||||
This module provides additional features for the built-in [[https://www.gnu.org/software/emacs/manual/html_mono/eshell.html][Emacs Shell]]
|
This module provides additional features for the built-in [[https://www.gnu.org/software/emacs/manual/html_mono/eshell.html][Emacs Shell]]
|
||||||
|
@ -30,7 +38,8 @@ company= is enabled.
|
||||||
+ [[https://github.com/szermatt/emacs-bash-completion][bash-completion]]
|
+ [[https://github.com/szermatt/emacs-bash-completion][bash-completion]]
|
||||||
|
|
||||||
* Prerequisites
|
* Prerequisites
|
||||||
This module has no prerequisites.
|
[[https://fishshell.com/][=fish= shell]] for completions, falling back to [[https://www.gnu.org/software/bash/][=bash= shell]] if =fish= is not
|
||||||
|
found. If neither shell is found, completions may not be available.
|
||||||
|
|
||||||
* Features
|
* Features
|
||||||
+ Command completion with Company
|
+ Command completion with Company
|
||||||
|
|
|
@ -82,10 +82,6 @@ You should use `set-eshell-alias!' to change this.")
|
||||||
;; Enable autopairing in eshell
|
;; Enable autopairing in eshell
|
||||||
(add-hook 'eshell-mode-hook #'smartparens-mode)
|
(add-hook 'eshell-mode-hook #'smartparens-mode)
|
||||||
|
|
||||||
;; Comapny completion integration
|
|
||||||
(when (featurep! :completion company)
|
|
||||||
(add-hook 'eshell-mode-hook #'company-mode))
|
|
||||||
|
|
||||||
;; Persp-mode/workspaces integration
|
;; Persp-mode/workspaces integration
|
||||||
(when (featurep! :ui workspaces)
|
(when (featurep! :ui workspaces)
|
||||||
(add-hook 'persp-activated-functions #'+eshell-switch-workspace-fn)
|
(add-hook 'persp-activated-functions #'+eshell-switch-workspace-fn)
|
||||||
|
@ -157,8 +153,6 @@ You should use `set-eshell-alias!' to change this.")
|
||||||
[remap evil-delete-back-to-indentation] #'eshell-kill-input
|
[remap evil-delete-back-to-indentation] #'eshell-kill-input
|
||||||
[remap evil-window-split] #'+eshell/split-below
|
[remap evil-window-split] #'+eshell/split-below
|
||||||
[remap evil-window-vsplit] #'+eshell/split-right
|
[remap evil-window-vsplit] #'+eshell/split-right
|
||||||
|
|
||||||
;; Local-leader keybindings
|
|
||||||
(:localleader
|
(:localleader
|
||||||
"b" #'eshell-insert-buffer-name
|
"b" #'eshell-insert-buffer-name
|
||||||
"e" #'eshell-insert-envvar
|
"e" #'eshell-insert-envvar
|
||||||
|
@ -196,4 +190,6 @@ You should use `set-eshell-alias!' to change this.")
|
||||||
|
|
||||||
;; Active eshell-did-you-mean using its setup function which provides
|
;; Active eshell-did-you-mean using its setup function which provides
|
||||||
;; its own hooks.
|
;; its own hooks.
|
||||||
(eshell-did-you-mean-setup)
|
(use-package! eshell-did-you-mean
|
||||||
|
:after eshell
|
||||||
|
:config (eshell-did-you-mean-setup))
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
(package! eshell-z :pin "337cb241e1")
|
(package! eshell-z :pin "337cb241e1")
|
||||||
(package! shrink-path :pin "c14882c859")
|
(package! shrink-path :pin "c14882c859")
|
||||||
(package! esh-help :pin "417673ed18")
|
(package! esh-help :pin "417673ed18")
|
||||||
(package! eshell-did-you-mean :pin "7cb6ef")
|
(package! eshell-did-you-mean :pin "7cb6ef8e22")
|
||||||
|
|
||||||
(when (featurep! :completion company)
|
(when (featurep! :completion company)
|
||||||
(package! fish-completion :pin "1038488181")
|
(package! fish-completion :pin "1038488181")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue