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-yaml.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oni-yaml.el') diff --git a/oni-yaml.el b/oni-yaml.el index 5ed5ca0..ba65d4c 100644 --- a/oni-yaml.el +++ b/oni-yaml.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0719.212242 +;; Version: 2020.0907.144306 ;; Package-Requires: (yaml-mode oni-flycheck oni-fci oni-highlight-indent-guides flycheck-yamllint indent-tools yaml-imenu) ;; This program is free software; you can redistribute it and/or modify @@ -39,11 +39,15 @@ (add-hook 'yaml-mode-hook 'electric-indent-local-mode) (add-hook 'yaml-mode-hook 'electric-pair-local-mode) -(add-hook 'yaml-mode-hook 'fci-mode) (add-hook 'yaml-mode-hook 'highlight-indent-guides-mode) (add-hook 'yaml-mode-hook 'oni-yaml--auto-fill-mode) (add-hook 'yaml-mode-hook 'yaml-imenu-enable) +(add-hook 'yaml-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + (flycheck-yamllint-setup) ;;;###autoload(with-eval-after-load 'yaml-mode (require 'oni-yaml)) -- cgit v1.2.3-54-g00ecf