From b6718715fedb42e35b3f785bd5240f1753654a6c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 21 Jan 2019 22:13:39 -0500 Subject: [PATCH] Fix doom-big-font-mode when no frame exists It must still be appended to emacs-startup-hook. If it's run any earlier, doom|init-fonts will overwrite it. Reported by @ar1a. --- core/autoload/ui.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/autoload/ui.el b/core/autoload/ui.el index 2b6ee3f52..28ac10180 100644 --- a/core/autoload/ui.el +++ b/core/autoload/ui.el @@ -180,7 +180,12 @@ Uses `doom-big-font' when enabled." (user-error "`doom-big-font' must be set to a valid font")) (unless doom-font (user-error "`doom-font' must be set to a valid font")) - (set-frame-font (if doom-big-font-mode - doom-big-font - doom-font) - t t)) + (let ((doom-font (if doom-big-font-mode + doom-big-font + doom-font))) + (setf (alist-get 'font default-frame-alist) + (cond ((null doom-font)) + ((stringp doom-font) doom-font) + ((fontp doom-font) (font-xlfd-name doom-font)) + ((signal 'wrong-type-argument (list '(fontp stringp) doom-font))))) + (set-frame-font doom-font t t)))