diff --git a/init.d/text/common.el b/init.d/text/common.el index da2075e..13f49ea 100644 --- a/init.d/text/common.el +++ b/init.d/text/common.el @@ -1,6 +1,6 @@ ;;; common.el --- Common settings for text files. -*- lexical-binding: t; -*- -;; Time-stamp: <2020-11-26T13:04:50+0100> +;; Time-stamp: <2020-11-29T09:08:31+0100> ;;; Commentary: @@ -49,27 +49,30 @@ ;; Ruler with fill-column marker. (use-package ruler-mode - :after (doom-themes) + :after (doom-themes display-line-numbers) + :demand t :config (progn - (set-face-background 'ruler-mode-default - (face-foreground 'line-number)) - (set-face-foreground 'ruler-mode-default - (face-background 'default)) - (set-face-foreground 'ruler-mode-column-number - (face-background 'default)) - (if (and (window-system) - (>= emacs-major-version 27)) + (defun my/ruler-set-colors () + (set-face-background 'ruler-mode-default + (face-foreground 'line-number)) + (set-face-foreground 'ruler-mode-default + (face-background 'default)) + (set-face-foreground 'ruler-mode-column-number + (face-background 'default)) + (if (and (window-system) + (>= emacs-major-version 27)) + (set-face-foreground 'ruler-mode-fill-column + (face-foreground + 'fill-column-indicator nil t)) (set-face-foreground 'ruler-mode-fill-column - (face-foreground - 'fill-column-indicator nil t)) - (set-face-foreground 'ruler-mode-fill-column - (face-foreground 'shadow))) - (set-face-foreground 'ruler-mode-comment-column - (face-foreground 'ruler-mode-fill-column)) - (set-face-foreground 'ruler-mode-goal-column - (face-foreground 'ruler-mode-fill-column)) - (set-face-foreground 'ruler-mode-current-column - (face-foreground 'line-number-current-line)) + (face-foreground 'shadow))) + (set-face-foreground 'ruler-mode-comment-column + (face-foreground 'ruler-mode-fill-column)) + (set-face-foreground 'ruler-mode-goal-column + (face-foreground 'ruler-mode-fill-column)) + (set-face-foreground 'ruler-mode-current-column + (face-foreground 'line-number-current-line))) + (my/ruler-set-colors) (defun my/ruler-on () "Turn `ruler-mode' on." @@ -77,7 +80,8 @@ :custom-face (ruler-mode-default ((t (:inherit·default :box·nil)))) :hook ((find-file . my/ruler-on) - (text-mode . my/ruler-on))) ; For the scratch buffer. + (text-mode . my/ruler-on) ; For the scratch buffer. + (server-after-make-frame . my/ruler-set-colors))) ;; Show a fill-column indicator vertically across the buffer. (when (>= emacs-major-version 27)