diff options
| author |  Tom Willemse | 2020-09-07 14:45:10 -0700 |
|---|---|---|
| committer | Tom Willemse | 2020-09-07 14:45:10 -0700 |
| commit | 4d0a1c884d4b43b7378bae77f8a468b246fd2367 (patch) | |
| tree | b113c20371cc9d3e4a75d1601d39f1528b7c33b3 /oni-java.el | |
| parent | 85636d669c8a59fe49d66a22e2bba5492fd9dbff (diff) | |
| download | emacs-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-java.el')
| -rw-r--r-- | oni-java.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/oni-java.el b/oni-java.el index b46ebbc..72ca8b8 100644 --- a/oni-java.el +++ b/oni-java.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0305.222356 +;; Version: 2020.0907.143141 ;; Package-Requires: (oni-fci oni-data-dir oni-lsp oni-hydra lsp-java company-lsp) ;; This program is free software; you can redistribute it and/or modify @@ -72,9 +72,13 @@ (add-hook 'java-mode-hook 'auto-fill-mode) (add-hook 'java-mode-hook 'electric-indent-local-mode) (add-hook 'java-mode-hook 'electric-pair-local-mode) -(add-hook 'java-mode-hook 'fci-mode) (add-hook 'java-mode-hook 'lsp) +(add-hook 'java-mode-hook + (if (fboundp 'display-fill-column-indicator-mode) + 'display-fill-column-indicator-mode + 'fci-mode)) + (add-to-list 'company-backends 'company-lsp) (define-key java-mode-map (kbd "C-c r") 'java-refactor-hydra/body) |