aboutsummaryrefslogtreecommitdiffstats
path: root/oni-js.el
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-js.el
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-js.el')
-rw-r--r--oni-js.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/oni-js.el b/oni-js.el
index 534b0c8..5222db2 100644
--- a/oni-js.el
+++ b/oni-js.el
@@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2019.1210.230928
+;; Version: 2020.0907.143324
;; Package-Requires: (oni-company js2-mode js2-refactor oni-fci oni-flycheck tern company-tern fic-mode rjsx-mode)
;; This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,6 @@
(add-hook 'js2-mode-hook 'company-mode)
(add-hook 'js2-mode-hook 'electric-pair-local-mode)
-(add-hook 'js2-mode-hook 'fci-mode)
(add-hook 'js2-mode-hook 'fic-mode)
(add-hook 'js2-mode-hook 'flycheck-mode)
(add-hook 'js2-mode-hook 'js2-refactor-mode)
@@ -67,6 +66,11 @@
(add-hook 'js2-mode-hook 'tern-mode)
(add-hook 'js2-mode-hook 'oni-js--auto-fill-mode)
+(add-hook 'js2-mode-hook
+ (if (fboundp 'display-fill-column-indicator-mode)
+ 'display-fill-column-indicator-mode
+ 'fci-mode))
+
(js2r-add-keybindings-with-prefix "C-c r")
(add-to-list 'company-backends 'company-tern)