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-cmake.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oni-cmake.el') diff --git a/oni-cmake.el b/oni-cmake.el index 3f26444..836f27c 100644 --- a/oni-cmake.el +++ b/oni-cmake.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0229.130404 +;; Version: 2020.0907.143950 ;; Package-Requires: (cmake-mode oni-company oni-fci oni-flycheck cmake-font-lock eldoc-cmake) ;; This program is free software; you can redistribute it and/or modify @@ -38,9 +38,13 @@ (add-hook 'cmake-mode-hook 'company-mode) (add-hook 'cmake-mode-hook 'eldoc-cmake-enable) (add-hook 'cmake-mode-hook 'electric-pair-local-mode) -(add-hook 'cmake-mode-hook 'fci-mode) (add-hook 'cmake-mode-hook 'oni-cmake--auto-fill-mode) +(add-hook 'cmake-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + (add-to-list 'compilation-error-regexp-alist `(,(rx bol "CMake Warning (dev) at " -- cgit v1.2.3-54-g00ecf