From 09f602b3426c22a701a5627f66535d033b817257 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 22 Mar 2023 17:58:21 -0400 Subject: [PATCH] fix(unicode): unicode-fonts remapping for daemon The unicode remappings were done too early, prior to this change, making them ineffective for later daemon frames. Fix: #5486 Fix: #7160 --- modules/ui/unicode/autoload.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/ui/unicode/autoload.el b/modules/ui/unicode/autoload.el index 7bd7371cf..45a63ca66 100644 --- a/modules/ui/unicode/autoload.el +++ b/modules/ui/unicode/autoload.el @@ -1,21 +1,19 @@ ;;; ui/unicode/autoload.el -*- lexical-binding: t; -*- ;;;###autoload -(add-hook! 'doom-init-ui-hook +(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) - (if (display-graphic-p) - (+unicode-setup-fonts-h (selected-frame)) - (add-hook 'after-make-frame-functions #'+unicode-setup-fonts-h)))) + (+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-graphic-p frame)) + (when (and frame (display-multi-font-p frame)) (with-selected-frame frame (require 'unicode-fonts) (when doom-unicode-font