aboutsummaryrefslogtreecommitdiffstats
path: root/oni-sh.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2020-09-07 14:45:10 -0700
committerGravatar Tom Willemse2020-09-07 14:45:10 -0700
commit4d0a1c884d4b43b7378bae77f8a468b246fd2367 (patch)
treeb113c20371cc9d3e4a75d1601d39f1528b7c33b3 /oni-sh.el
parent85636d669c8a59fe49d66a22e2bba5492fd9dbff (diff)
downloademacs-config-4d0a1c884d4b43b7378bae77f8a468b246fd2367.tar.gz
emacs-config-4d0a1c884d4b43b7378bae77f8a468b246fd2367.zip
Use ‘display-fill-column-indicator-mode’ if possible
Fall back to ‘fci-mode’ if the function ‘display-fill-column-indicator-mode’ doesn’t exist.
Diffstat (limited to 'oni-sh.el')
-rw-r--r--oni-sh.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/oni-sh.el b/oni-sh.el
index ee22755..eee240a 100644
--- a/oni-sh.el
+++ b/oni-sh.el
@@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2020.0427.091422
+;; Version: 2020.0907.143035
;; Package-Requires: (reformatter oni-flycheck oni-fci oni-smartparens)
;; This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,8 @@
;; This sets the following minor modes for ‘sh-mode’:
;; - ‘electric-indent-local-mode’
;; - ‘electric-pair-local-mode’
-;; - ‘fci-mode’
+;; - ‘display-fill-column-indicator-mode’ (falls back to ‘fci-mode’ if this mode
+;; doesn’t exist.
;; - ‘flycheck-mode’
;; It also defines a formatter using ‘reformatter’ which runs the shfmt utility.
@@ -44,11 +45,15 @@
:group 'shfmt)
(add-hook 'sh-mode-hook 'electric-indent-local-mode)
-(add-hook 'sh-mode-hook 'fci-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))