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-csharp/oni-csharp.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oni-csharp') diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el index b15e163..07ab27e 100644 --- a/oni-csharp/oni-csharp.el +++ b/oni-csharp/oni-csharp.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0825.163721 +;; Version: 2020.0907.144202 ;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci oni-lsp smartparens) ;; This program is free software; you can redistribute it and/or modify @@ -144,7 +144,6 @@ _cs_: Solution (add-hook 'csharp-mode-hook 'company-mode) (add-hook 'csharp-mode-hook 'electric-indent-local-mode) -(add-hook 'csharp-mode-hook 'fci-mode) (add-hook 'csharp-mode-hook 'flycheck-mode) (add-hook 'csharp-mode-hook 'lsp) (add-hook 'csharp-mode-hook 'oni-csharp--auto-fill-mode) @@ -152,6 +151,11 @@ _cs_: Solution (add-hook 'csharp-mode-hook 'rainbow-delimiters-mode) (add-hook 'csharp-mode-hook 'smartparens-mode) +(add-hook 'csharp-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + (define-key csharp-mode-map (kbd "C-c SPC") 'oni-csharp-hydra/body) ;;;###autoload -- cgit v1.2.3-54-g00ecf