aboutsummaryrefslogtreecommitdiffstats
path: root/oni-php
diff options
context:
space:
mode:
authorGravatar Tom Willemse2020-09-07 14:45:10 -0700
committerGravatar Tom Willemse2020-09-07 14:45:10 -0700
commit4d0a1c884d4b43b7378bae77f8a468b246fd2367 (patch)
treeb113c20371cc9d3e4a75d1601d39f1528b7c33b3 /oni-php
parent85636d669c8a59fe49d66a22e2bba5492fd9dbff (diff)
downloademacs-config-4d0a1c884d4b43b7378bae77f8a468b246fd2367.tar.gz
emacs-config-4d0a1c884d4b43b7378bae77f8a468b246fd2367.zip
Use ‘display-fill-column-indicator-mode’ if possible
Fall back to ‘fci-mode’ if the function ‘display-fill-column-indicator-mode’ doesn’t exist.
Diffstat (limited to 'oni-php')
-rw-r--r--oni-php/oni-php.el8
1 files changed, 6 insertions, 2 deletions
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 <tom@ryuslash.org>
;; 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))