diff options
| -rw-r--r-- | oni-c.el | 10 | ||||
| -rw-r--r-- | oni-cmake.el | 10 | ||||
| -rw-r--r-- | oni-cpp.el | 10 | ||||
| -rw-r--r-- | oni-csharp/oni-csharp.el | 10 | ||||
| -rw-r--r-- | oni-css/oni-css.el | 12 | ||||
| -rw-r--r-- | oni-elisp/oni-elisp.el | 10 | ||||
| -rw-r--r-- | oni-fci.el | 37 | ||||
| -rw-r--r-- | oni-java.el | 10 | ||||
| -rw-r--r-- | oni-js.el | 12 | ||||
| -rw-r--r-- | oni-lua.el | 10 | ||||
| -rw-r--r-- | oni-makefile.el | 9 | ||||
| -rw-r--r-- | oni-php/oni-php.el | 10 | ||||
| -rw-r--r-- | oni-python/oni-python.el | 10 | ||||
| -rw-r--r-- | oni-ruby/oni-ruby.el | 10 | ||||
| -rw-r--r-- | oni-scheme.el | 12 | ||||
| -rw-r--r-- | oni-sh.el | 13 | ||||
| -rw-r--r-- | oni-yaml.el | 10 |
17 files changed, 51 insertions, 154 deletions
@@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.1212.220909 -;; Package-Requires: (oni-flycheck oni-fci oni-lsp reformatter) +;; Version: 2021.0622.220854 +;; Package-Requires: (oni-flycheck oni-lsp reformatter) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -40,6 +40,7 @@ :group 'oni-c) (add-hook 'c-mode-hook 'abbrev-mode) +(add-hook 'c-mode-hook 'display-fill-column-indicator-mode) (add-hook 'c-mode-hook 'electric-indent-local-mode) (add-hook 'c-mode-hook 'electric-pair-local-mode) (add-hook 'c-mode-hook 'flycheck-mode) @@ -47,11 +48,6 @@ (add-hook 'c-mode-hook 'oni-c--auto-fill-mode) (add-hook 'c-mode-hook 'oni-c-clang-formatter-on-save-mode) -(add-hook 'c-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - (define-abbrev c-mode-abbrev-table "and" "&&" nil :system t) (define-abbrev c-mode-abbrev-table "or" "||" nil :system t) diff --git a/oni-cmake.el b/oni-cmake.el index 9f38369..714eea0 100644 --- a/oni-cmake.el +++ b/oni-cmake.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0309.172514 -;; Package-Requires: (cmake-mode oni-company oni-fci oni-flycheck oni-lsp cmake-font-lock eldoc-cmake) +;; Version: 2021.0622.220924 +;; Package-Requires: (cmake-mode oni-company oni-flycheck oni-lsp cmake-font-lock eldoc-cmake) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ (add-hook 'cmake-mode-hook 'cmake-font-lock-activate) (add-hook 'cmake-mode-hook 'company-mode) +(add-hook 'cmake-mode-hook 'display-fill-column-indicator-mode) (add-hook 'cmake-mode-hook 'eldoc-cmake-enable) (add-hook 'cmake-mode-hook 'electric-indent-local-mode) (add-hook 'cmake-mode-hook 'electric-pair-local-mode) @@ -43,11 +44,6 @@ (add-hook 'cmake-mode-hook 'oni-cmake--auto-fill-mode) (add-hook 'cmake-mode-hook 'rainbow-delimiters-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 " @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.144055 -;; Package-Requires: (oni-company oni-flycheck oni-fci) +;; Version: 2021.0622.220950 +;; Package-Requires: (oni-company oni-flycheck) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -32,16 +32,12 @@ (auto-fill-mode)) (add-hook 'c++-mode-hook 'company-mode) +(add-hook 'c++-mode-hook 'display-fill-column-indicator-mode) (add-hook 'c++-mode-hook 'electric-indent-local-mode) (add-hook 'c++-mode-hook 'electric-pair-local-mode) (add-hook 'c++-mode-hook 'flycheck-mode) (add-hook 'c++-mode-hook 'oni-cpp--auto-fill-mode) -(add-hook 'c++-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload(with-eval-after-load 'cc-mode (require 'oni-cpp)) (provide 'oni-cpp) diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el index de33eb6..209d61e 100644 --- a/oni-csharp/oni-csharp.el +++ b/oni-csharp/oni-csharp.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.1212.221001 -;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci oni-lsp smartparens) +;; Version: 2021.0622.221011 +;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-lsp smartparens) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -144,6 +144,7 @@ _cs_: Solution (add-hook 'csharp-mode-hook 'abbrev-mode) (add-hook 'csharp-mode-hook 'company-mode) +(add-hook 'csharp-mode-hook 'display-fill-column-indicator-mode) (add-hook 'csharp-mode-hook 'electric-indent-local-mode) (add-hook 'csharp-mode-hook 'flycheck-mode) (add-hook 'csharp-mode-hook 'lsp) @@ -152,11 +153,6 @@ _cs_: Solution (add-hook 'csharp-mode-hook 'rainbow-delimiters-mode) (add-hook 'csharp-mode-hook 'smartparens-mode) -(add-hook 'csharp-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - (define-key csharp-mode-map (kbd "C-c SPC") 'oni-csharp-hydra/body) (define-abbrev csharp-mode-abbrev-table "and" "&&" nil :system t) diff --git a/oni-css/oni-css.el b/oni-css/oni-css.el index 3c89c0b..8e6fdff 100644 --- a/oni-css/oni-css.el +++ b/oni-css/oni-css.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.143210 -;; Package-Requires: (oni-company oni-fci oni-hydra rainbow-mode yasnippet) +;; Version: 2021.0622.221029 +;; Package-Requires: (oni-company oni-hydra rainbow-mode yasnippet) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -94,15 +94,11 @@ (setq css-indent-offset 2) (add-hook 'css-mode-hook 'company-mode) +(add-hook 'css-mode-hook 'display-fill-column-indicator-mode) (add-hook 'css-mode-hook 'electric-indent-local-mode) (add-hook 'css-mode-hook 'electric-pair-local-mode) -(add-hook 'css-mode-hook 'rainbow-mode) (add-hook 'css-mode-hook 'oni-css--auto-fill-mode) - -(add-hook 'css-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) +(add-hook 'css-mode-hook 'rainbow-mode) (with-eval-after-load 'compile (let ((scss-error-regexp diff --git a/oni-elisp/oni-elisp.el b/oni-elisp/oni-elisp.el index 9eb62d5..9dc71ff 100644 --- a/oni-elisp/oni-elisp.el +++ b/oni-elisp/oni-elisp.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0509.010120 -;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-fci oni-yasnippet oni-hydra rainbow-delimiters nameless erefactor flycheck-relint handle elisp-format) +;; Version: 2021.0622.221045 +;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-yasnippet oni-hydra rainbow-delimiters nameless erefactor flycheck-relint handle elisp-format) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -95,6 +95,7 @@ _eb_: Buffer (add-hook 'emacs-lisp-mode-hook #'oni-elisp-auto-fill-mode) (add-hook 'emacs-lisp-mode-hook 'company-mode) +(add-hook 'emacs-lisp-mode-hook 'display-fill-column-indicator-mode) (add-hook 'emacs-lisp-mode-hook 'electric-quote-local-mode) (add-hook 'emacs-lisp-mode-hook 'erefactor-lazy-highlight-turn-on) (add-hook 'emacs-lisp-mode-hook 'flycheck-mode) @@ -102,11 +103,6 @@ _eb_: Buffer (add-hook 'emacs-lisp-mode-hook 'paredit-mode) (add-hook 'emacs-lisp-mode-hook 'rainbow-delimiters-mode) -(add-hook 'emacs-lisp-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - (add-hook 'ielm-mode-hook #'oni-elisp-setup-ielm-mode-line) (add-hook 'ielm-mode-hook 'company-mode) (add-hook 'ielm-mode-hook 'paredit-mode) diff --git a/oni-fci.el b/oni-fci.el deleted file mode 100644 index 825ab3e..0000000 --- a/oni-fci.el +++ /dev/null @@ -1,37 +0,0 @@ -;;; oni-fci.el --- Fill Column Indicator configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2019 Tom Willemse - -;; Author: Tom Willemse <tom@ryuslash.org> -;; Keywords: local -;; Version: 2019.0904.210527 -;; Package-Requires: (fill-column-indicator) - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. - -;;; Commentary: - -;; Fill Column Indicator configuration. - -;;; Code: - -(require 'fill-column-indicator) - -(when (eql system-type 'windows-nt) - (setq fci-always-use-textual-rule t)) - -;;;###autoload(with-eval-after-load 'fill-column-indicator (require 'oni-fci)) - -(provide 'oni-fci) -;;; oni-fci.el ends here diff --git a/oni-java.el b/oni-java.el index 983a966..1f16e87 100644 --- a/oni-java.el +++ b/oni-java.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0418.165518 -;; Package-Requires: (oni-fci oni-data-dir oni-lsp oni-hydra lsp-java rainbow-delimiters) +;; Version: 2021.0622.221131 +;; Package-Requires: (oni-data-dir oni-lsp oni-hydra lsp-java rainbow-delimiters) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -71,16 +71,12 @@ (add-hook 'java-mode-hook #'oni-java-only-fill-comments) (add-hook 'java-mode-hook 'abbrev-mode) (add-hook 'java-mode-hook 'auto-fill-mode) +(add-hook 'java-mode-hook 'display-fill-column-indicator-mode) (add-hook 'java-mode-hook 'electric-indent-local-mode) (add-hook 'java-mode-hook 'electric-pair-local-mode) (add-hook 'java-mode-hook 'lsp) (add-hook 'java-mode-hook 'rainbow-delimiters-mode) -(add-hook 'java-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - (define-key java-mode-map (kbd "C-c r") 'java-refactor-hydra/body) (define-key java-mode-map (kbd "C-c d") 'java-documentation-hydra/body) @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0131.153554 -;; Package-Requires: (oni-company js2-mode js2-refactor oni-fci oni-flycheck tern fic-mode rjsx-mode) +;; Version: 2021.0622.221147 +;; Package-Requires: (oni-company js2-mode js2-refactor oni-flycheck tern fic-mode rjsx-mode) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -57,19 +57,15 @@ (add-hook 'js-mode-hook 'oni-js--auto-fill-mode) (add-hook 'js2-mode-hook 'company-mode) +(add-hook 'js2-mode-hook 'display-fill-column-indicator-mode) (add-hook 'js2-mode-hook 'electric-pair-local-mode) (add-hook 'js2-mode-hook 'fic-mode) (add-hook 'js2-mode-hook 'flycheck-mode) (add-hook 'js2-mode-hook 'js2-refactor-mode) +(add-hook 'js2-mode-hook 'oni-js--auto-fill-mode) (add-hook 'js2-mode-hook 'oni-js-whitespace-mode) (add-hook 'js2-mode-hook 'subword-mode) (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") @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <chelys@rincewind> ;; Keywords: local -;; Version: 2020.0907.143421 -;; Package-Requires: (lua-mode oni-fci rainbow-delimiters) +;; Version: 2021.0622.221212 +;; Package-Requires: (lua-mode rainbow-delimiters) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -26,13 +26,9 @@ ;;; Code: +(add-hook 'lua-mode-hook 'display-fill-column-indicator-mode) (add-hook 'lua-mode-hook 'rainbow-delimiters-mode) -(add-hook 'lua-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload(with-eval-after-load 'lua-mode (require 'oni-lua)) (provide 'oni-lua) diff --git a/oni-makefile.el b/oni-makefile.el index 053240d..eeb7275 100644 --- a/oni-makefile.el +++ b/oni-makefile.el @@ -4,8 +4,7 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.141543 -;; Package-Requires: (oni-fci) +;; Version: 2021.0622.221229 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -39,14 +38,10 @@ (auto-fill-mode)) (add-hook 'makefile-mode-hook #'oni-makefile--whitespace-mode) +(add-hook 'makefile-mode-hook 'display-fill-column-indicator-mode) (add-hook 'makefile-mode-hook 'electric-pair-local-mode) (add-hook 'makefile-mode-hook 'oni-makefile--auto-fill-mode) -(add-hook 'makefile-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload(with-eval-after-load 'make-mode (require 'oni-makefile)) (provide 'oni-makefile) diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el index db35b2d..f509e3d 100644 --- a/oni-php/oni-php.el +++ b/oni-php/oni-php.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0206.180743 -;; Package-Requires: (php-mode oni-yasnippet oni-flycheck oni-company oni-fci oni-hydra ggtags fic-mode company-php) +;; Version: 2021.0622.221244 +;; Package-Requires: (php-mode oni-yasnippet oni-flycheck oni-company oni-hydra ggtags fic-mode company-php) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -73,6 +73,7 @@ nil for some reason." (add-hook 'php-mode-hook #'oni-php--set-require-final-newline) (add-hook 'php-mode-hook #'oni-php--whitespace-mode) (add-hook 'php-mode-hook 'company-mode) +(add-hook 'php-mode-hook 'display-fill-column-indicator-mode) (add-hook 'php-mode-hook 'electric-indent-local-mode) (add-hook 'php-mode-hook 'electric-pair-local-mode) (add-hook 'php-mode-hook 'fic-mode) @@ -80,11 +81,6 @@ nil for some reason." (add-hook 'php-mode-hook 'ggtags-mode) (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)) diff --git a/oni-python/oni-python.el b/oni-python/oni-python.el index c4bea82..22e26ef 100644 --- a/oni-python/oni-python.el +++ b/oni-python/oni-python.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.143301 -;; Package-Requires: (oni-yasnippet oni-company oni-fci oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad) +;; Version: 2021.0622.221258 +;; Package-Requires: (oni-yasnippet oni-company oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -88,6 +88,7 @@ for indentation." (define-key python-mode-map (kbd "C-c r") 'python-refactor-hydra/body) (add-hook 'python-mode-hook 'company-mode) +(add-hook 'python-mode-hook 'display-fill-column-indicator-mode) (add-hook 'python-mode-hook 'electric-indent-local-mode) (add-hook 'python-mode-hook 'electric-pair-local-mode) (add-hook 'python-mode-hook 'flycheck-mode) @@ -97,11 +98,6 @@ for indentation." (add-hook 'python-mode-hook 'python-black-on-save-mode) (add-hook 'python-mode-hook 'rainbow-delimiters-mode) -(add-hook 'python-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload (with-eval-after-load 'python (with-eval-after-load 'yasnippet diff --git a/oni-ruby/oni-ruby.el b/oni-ruby/oni-ruby.el index 16ceec0..7ad5065 100644 --- a/oni-ruby/oni-ruby.el +++ b/oni-ruby/oni-ruby.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.142903 -;; Package-Requires: (ruby-mode oni-fci oni-yasnippet) +;; Version: 2021.0622.221314 +;; Package-Requires: (ruby-mode oni-yasnippet) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -50,15 +50,11 @@ (setq-local comment-auto-fill-only-comments t) (auto-fill-mode)) +(add-hook 'ruby-mode-hook 'display-fill-column-indicator-mode) (add-hook 'ruby-mode-hook 'electric-indent-local-mode) (add-hook 'ruby-mode-hook 'electric-pair-local-mode) (add-hook 'ruby-mode-hook 'oni-ruby--auto-fill-mode) -(add-hook 'ruby-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload (with-eval-after-load 'ruby-mode (with-eval-after-load 'yasnippet diff --git a/oni-scheme.el b/oni-scheme.el index a5f9452..69fd8b4 100644 --- a/oni-scheme.el +++ b/oni-scheme.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2021.0413.153306 -;; Package-Requires: (oni-company oni-paredit oni-fci rainbow-delimiters geiser geiser-guile) +;; Version: 2021.0622.221328 +;; Package-Requires: (oni-company oni-paredit rainbow-delimiters geiser geiser-guile) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -36,14 +36,10 @@ (auto-fill-mode)) (add-hook 'scheme-mode-hook 'company-mode) +(add-hook 'scheme-mode-hook 'display-fill-column-indicator-mode) +(add-hook 'scheme-mode-hook 'oni-scheme--auto-fill-mode) (add-hook 'scheme-mode-hook 'paredit-mode) (add-hook 'scheme-mode-hook 'rainbow-delimiters-mode) -(add-hook 'scheme-mode-hook 'oni-scheme--auto-fill-mode) - -(add-hook 'scheme-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) (add-hook 'geiser-repl-mode-hook 'paredit-mode) @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.143035 -;; Package-Requires: (reformatter oni-flycheck oni-fci oni-smartparens) +;; Version: 2021.0622.221353 +;; Package-Requires: (reformatter oni-flycheck oni-smartparens) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -27,8 +27,7 @@ ;; This sets the following minor modes for ‘sh-mode’: ;; - ‘electric-indent-local-mode’ ;; - ‘electric-pair-local-mode’ -;; - ‘display-fill-column-indicator-mode’ (falls back to ‘fci-mode’ if this mode -;; doesn’t exist. +;; - ‘display-fill-column-indicator-mode’ ;; - ‘flycheck-mode’ ;; It also defines a formatter using ‘reformatter’ which runs the shfmt utility. @@ -44,16 +43,12 @@ :lighter "" :group 'shfmt) +(add-hook 'sh-mode-hook 'display-fill-column-indicator-mode) (add-hook 'sh-mode-hook 'electric-indent-local-mode) (add-hook 'sh-mode-hook 'flycheck-mode) (add-hook 'sh-mode-hook 'shfmt-on-save-mode) (add-hook 'sh-mode-hook 'smartparens-mode) -(add-hook 'sh-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - ;;;###autoload (add-to-list 'auto-mode-alist '("PKGBUILD\\'" . sh-mode)) diff --git a/oni-yaml.el b/oni-yaml.el index ba65d4c..23a97e8 100644 --- a/oni-yaml.el +++ b/oni-yaml.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0907.144306 -;; Package-Requires: (yaml-mode oni-flycheck oni-fci oni-highlight-indent-guides flycheck-yamllint indent-tools yaml-imenu) +;; Version: 2021.0622.221406 +;; Package-Requires: (yaml-mode oni-flycheck oni-highlight-indent-guides flycheck-yamllint indent-tools yaml-imenu) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -37,17 +37,13 @@ (define-key yaml-mode-map (kbd "C-c >") 'indent-tools-hydra/body) +(add-hook 'yaml-mode-hook 'display-fill-column-indicator-mode) (add-hook 'yaml-mode-hook 'electric-indent-local-mode) (add-hook 'yaml-mode-hook 'electric-pair-local-mode) (add-hook 'yaml-mode-hook 'highlight-indent-guides-mode) (add-hook 'yaml-mode-hook 'oni-yaml--auto-fill-mode) (add-hook 'yaml-mode-hook 'yaml-imenu-enable) -(add-hook 'yaml-mode-hook - (if (fboundp 'display-fill-column-indicator-mode) - 'display-fill-column-indicator-mode - 'fci-mode)) - (flycheck-yamllint-setup) ;;;###autoload(with-eval-after-load 'yaml-mode (require 'oni-yaml)) |