From 4d0a1c884d4b43b7378bae77f8a468b246fd2367 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 7 Sep 2020 14:45:10 -0700
Subject: Use ‘display-fill-column-indicator-mode’ if possible

Fall back to ‘fci-mode’ if the function ‘display-fill-column-indicator-mode’
doesn’t exist.
---
 oni-sh.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'oni-sh.el')

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))
 
-- 
cgit v1.2.3-54-g00ecf