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-python/oni-python.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oni-python') diff --git a/oni-python/oni-python.el b/oni-python/oni-python.el index d18fc9b..c4bea82 100644 --- a/oni-python/oni-python.el +++ b/oni-python/oni-python.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0706.231614 +;; Version: 2020.0907.143301 ;; Package-Requires: (oni-yasnippet oni-company oni-fci oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad) ;; This program is free software; you can redistribute it and/or modify @@ -90,7 +90,6 @@ for indentation." (add-hook 'python-mode-hook 'company-mode) (add-hook 'python-mode-hook 'electric-indent-local-mode) (add-hook 'python-mode-hook 'electric-pair-local-mode) -(add-hook 'python-mode-hook 'fci-mode) (add-hook 'python-mode-hook 'flycheck-mode) (add-hook 'python-mode-hook 'lsp) (add-hook 'python-mode-hook 'oni-python-set-fill-column) @@ -98,6 +97,11 @@ for indentation." (add-hook 'python-mode-hook 'python-black-on-save-mode) (add-hook 'python-mode-hook 'rainbow-delimiters-mode) +(add-hook 'python-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + ;;;###autoload (with-eval-after-load 'python (with-eval-after-load 'yasnippet -- cgit v1.2.3-54-g00ecf