aboutsummaryrefslogtreecommitdiffstats
path: root/oni-sh.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2021-06-22 22:19:53 -0700
committerGravatar Tom Willemse2021-06-22 22:19:53 -0700
commit89f8afa600e48983587c242f19c432a896540dd6 (patch)
tree68ee02f7876ee9acf56509dfc2d2a101d883e4e4 /oni-sh.el
parent64d3f0cbb9d21051ecb26f8c6a7681caa3c7030f (diff)
downloademacs-config-89f8afa600e48983587c242f19c432a896540dd6.tar.gz
emacs-config-89f8afa600e48983587c242f19c432a896540dd6.zip
[oni-fci] Remove configuration
‘fci-mode’ has been completely superseded by the built-in ‘display-fill-column-indicator-mode’.
Diffstat (limited to 'oni-sh.el')
-rw-r--r--oni-sh.el13
1 files changed, 4 insertions, 9 deletions
diff --git a/oni-sh.el b/oni-sh.el
index eee240a..441c65b 100644
--- a/oni-sh.el
+++ b/oni-sh.el
@@ -4,8 +4,8 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2020.0907.143035
-;; Package-Requires: (reformatter oni-flycheck oni-fci oni-smartparens)
+;; Version: 2021.0622.221353
+;; Package-Requires: (reformatter oni-flycheck oni-smartparens)
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -27,8 +27,7 @@
;; This sets the following minor modes for ‘sh-mode’:
;; - ‘electric-indent-local-mode’
;; - ‘electric-pair-local-mode’
-;; - ‘display-fill-column-indicator-mode’ (falls back to ‘fci-mode’ if this mode
-;; doesn’t exist.
+;; - ‘display-fill-column-indicator-mode’
;; - ‘flycheck-mode’
;; It also defines a formatter using ‘reformatter’ which runs the shfmt utility.
@@ -44,16 +43,12 @@
:lighter ""
:group 'shfmt)
+(add-hook 'sh-mode-hook 'display-fill-column-indicator-mode)
(add-hook 'sh-mode-hook 'electric-indent-local-mode)
(add-hook 'sh-mode-hook 'flycheck-mode)
(add-hook 'sh-mode-hook 'shfmt-on-save-mode)
(add-hook 'sh-mode-hook 'smartparens-mode)
-(add-hook 'sh-mode-hook
- (if (fboundp 'display-fill-column-indicator-mode)
- 'display-fill-column-indicator-mode
- 'fci-mode))
-
;;;###autoload
(add-to-list 'auto-mode-alist '("PKGBUILD\\'" . sh-mode))