09f602b342
The unicode remappings were done too early, prior to this change, making them ineffective for later daemon frames. Fix: #5486 Fix: #7160
25 lines
1 KiB
EmacsLisp
25 lines
1 KiB
EmacsLisp
;;; ui/unicode/autoload.el -*- lexical-binding: t; -*-
|
|
|
|
;;;###autoload
|
|
(add-hook! 'after-setting-font-hook :depth -90
|
|
(defun +unicode-init-fonts-h ()
|
|
"Set up `unicode-fonts' to eventually run; accommodating the daemon, if
|
|
necessary."
|
|
(setq-default bidi-display-reordering t)
|
|
(+unicode-setup-fonts-h (selected-frame))))
|
|
|
|
;;;###autoload
|
|
(defun +unicode-setup-fonts-h (&optional frame)
|
|
"Initialize `unicode-fonts', if in a GUI session.
|
|
|
|
If doom-unicode-font is set, add it as preferred font for all unicode blocks."
|
|
(when (and frame (display-multi-font-p frame))
|
|
(with-selected-frame frame
|
|
(require 'unicode-fonts)
|
|
(when doom-unicode-font
|
|
(let ((doom-unicode-font-family (plist-get (font-face-attributes doom-unicode-font) :family)))
|
|
(dolist (unicode-block unicode-fonts-block-font-mapping)
|
|
(push doom-unicode-font-family (cadr unicode-block)))))
|
|
;; NOTE: will impact startup time on first run
|
|
(let (inhibit-redisplay inhibit-message)
|
|
(unicode-fonts-setup)))))
|