diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 403851ac4..cd528ca80 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -651,7 +651,7 @@ (:prefix-map ("t" . "toggle") :desc "Big mode" "b" #'doom-big-font-mode (:when (featurep! :ui fill-column) - :desc "Fill Column Indicator" "c" #'+fill-column-enable-h) + :desc "Fill Column Indicator" "c" #'+fill-column/toggle) :desc "Flymake" "f" #'flymake-mode (:when (featurep! :checkers syntax) :desc "Flycheck" "f" #'flycheck-mode) diff --git a/modules/ui/fill-column/autoload.el b/modules/ui/fill-column/autoload.el index cb2e595bf..a5cc28861 100644 --- a/modules/ui/fill-column/autoload.el +++ b/modules/ui/fill-column/autoload.el @@ -1,15 +1,14 @@ ;;; ui/fill-column/autoload.el -*- lexical-binding: t; -*- -;;;###autoload (autoload 'hl-fill-column-mode "hl-fill-column" nil t) +;;;###autoload +(defalias '+fill-column/toggle + (if (fboundp 'display-fill-column-indicator-mode) + #'display-fill-column-indicator-mode ; Emacs 27 only + (autoload 'hl-fill-column-mode "hl-fill-column" nil t) + #'hl-fill-column-mode)) ;;;###autoload -;; Emacs 27 introduced `display-fill-column-indicator-mode' which should be -;; used instead of `hl-fill-column-mode' -(defun +fill-column-enable-h (&optional arg) - (interactive "p") - (if (fboundp 'display-fill-column-indicator-mode) - (display-fill-column-indicator-mode arg) - (hl-fill-column-mode arg))) +(defalias '+fill-column-enable-h #'+fill-column/toggle) ;;;###autoload (add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)