mirror of
https://github.com/jimeh/.emacs.d.git
synced 2026-02-19 13:46:41 +00:00
feat(editor): Support Emacs 27's native fill-column-indicator
This commit is contained in:
@@ -6,12 +6,30 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-fci)
|
||||
;; Emacs 27.x and later: Use native display-fill-column-indicator
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(use-package display-fill-column-indicator
|
||||
:ensure nil ;; loaded from emacs built-ins
|
||||
|
||||
(defun siren-display-fill-column (&optional arg)
|
||||
"Activate or deactivate visual fill column.
|
||||
:hook
|
||||
(prog-mode . display-fill-column-indicator-mode)
|
||||
|
||||
:custom
|
||||
(display-fill-column-indicator-character ?\u2502))
|
||||
|
||||
(defun siren-display-fill-column (&optional arg)
|
||||
"Activate or deactivate visual fill column.
|
||||
Optional ARG is passed directly to mode toggle function."
|
||||
(fci-mode (or arg t)))
|
||||
(display-fill-column-indicator-mode arg)))
|
||||
|
||||
;; Emacs 26.x: Use fill-column-indicator package
|
||||
(when (version< emacs-version "27.0")
|
||||
(require 'siren-fci)
|
||||
|
||||
(defun siren-display-fill-column (&optional arg)
|
||||
"Activate or deactivate visual fill column.
|
||||
Optional ARG is passed directly to mode toggle function."
|
||||
(fci-mode (or arg t))))
|
||||
|
||||
(provide 'siren-display-fill-column)
|
||||
;;; siren-display-fill-column.el ends here
|
||||
|
||||
@@ -44,7 +44,10 @@
|
||||
(set-face-attribute 'font-lock-variable-name-face nil
|
||||
:foreground (doom-lighten (doom-color 'blue) 0.25))
|
||||
(set-face-attribute 'vertical-border nil
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1))
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(set-face-attribute 'fill-column-indicator nil
|
||||
:foreground (doom-lighten (doom-color 'base3) 0.10))))
|
||||
|
||||
(provide 'siren-theme-doom-nord-light)
|
||||
;;; siren-theme-doom-nord-light.el ends here
|
||||
|
||||
@@ -44,7 +44,10 @@
|
||||
(set-face-attribute 'font-lock-variable-name-face nil
|
||||
:foreground (doom-lighten (doom-color 'blue) 0.25))
|
||||
(set-face-attribute 'vertical-border nil
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1))
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(set-face-attribute 'fill-column-indicator nil
|
||||
:foreground (doom-lighten (doom-color 'base3) 0.10))))
|
||||
|
||||
(provide 'siren-theme-doom-nord)
|
||||
;;; siren-theme-doom-nord.el ends here
|
||||
|
||||
@@ -43,7 +43,10 @@
|
||||
(set-face-attribute 'font-lock-variable-name-face nil
|
||||
:foreground (doom-lighten (doom-color 'blue) 0.25))
|
||||
(set-face-attribute 'vertical-border nil
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1))
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(set-face-attribute 'fill-column-indicator nil
|
||||
:foreground (doom-lighten (doom-color 'base3) 0.10))))
|
||||
|
||||
(provide 'siren-theme-doom-one)
|
||||
;;; siren-theme-doom-one.el ends here
|
||||
|
||||
@@ -44,7 +44,10 @@
|
||||
(set-face-attribute 'font-lock-variable-name-face nil
|
||||
:foreground (doom-lighten (doom-color 'blue) 0.25))
|
||||
(set-face-attribute 'vertical-border nil
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1))
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(set-face-attribute 'fill-column-indicator nil
|
||||
:foreground (doom-lighten (doom-color 'base3) 0.10))))
|
||||
|
||||
(provide 'siren-theme-doom-opera-light)
|
||||
;;; siren-theme-doom-opera-light.el ends here
|
||||
|
||||
@@ -43,7 +43,10 @@
|
||||
(set-face-attribute 'font-lock-variable-name-face nil
|
||||
:foreground (doom-lighten (doom-color 'blue) 0.25))
|
||||
(set-face-attribute 'vertical-border nil
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1)))
|
||||
:foreground (doom-darken (doom-color 'vertical-bar) 0.1))
|
||||
(when (not (version< emacs-version "27.0"))
|
||||
(set-face-attribute 'fill-column-indicator nil
|
||||
:foreground (doom-lighten (doom-color 'base3) 0.10))))
|
||||
|
||||
(provide 'siren-theme-doom-vibrant)
|
||||
;;; siren-theme-doom-vibrant.el ends here
|
||||
|
||||
Reference in New Issue
Block a user