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-php/oni-php.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oni-php/oni-php.el') diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el index e302890..a38dcea 100644 --- a/oni-php/oni-php.el +++ b/oni-php/oni-php.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0305.222253 +;; Version: 2020.0907.142339 ;; Package-Requires: (php-mode oni-yasnippet oni-flycheck oni-company oni-fci oni-hydra ggtags fic-mode company-php phpcbf) ;; This program is free software; you can redistribute it and/or modify @@ -74,13 +74,17 @@ nil for some reason." (add-hook 'php-mode-hook 'company-mode) (add-hook 'php-mode-hook 'electric-indent-local-mode) (add-hook 'php-mode-hook 'electric-pair-local-mode) -(add-hook 'php-mode-hook 'fci-mode) (add-hook 'php-mode-hook 'fic-mode) (add-hook 'php-mode-hook 'flycheck-mode) (add-hook 'php-mode-hook 'ggtags-mode) (add-hook 'php-mode-hook 'phpcbf-enable-on-save) (add-hook 'php-mode-hook 'oni-php--auto-fill-mode) +(add-hook 'php-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + (with-eval-after-load 'company (add-to-list 'company-backends 'company-ac-php-backend)) -- cgit v1.2.3-54-g00ecf