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.
This commit is contained in:
Henrik Lissner 2019-01-21 22:13:39 -05:00
parent 89311f567e
commit b6718715fe
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -180,7 +180,12 @@ Uses `doom-big-font' when enabled."
(user-error "`doom-big-font' must be set to a valid font")) (user-error "`doom-big-font' must be set to a valid font"))
(unless doom-font (unless doom-font
(user-error "`doom-font' must be set to a valid font")) (user-error "`doom-font' must be set to a valid font"))
(set-frame-font (if doom-big-font-mode (let ((doom-font (if doom-big-font-mode
doom-big-font doom-big-font
doom-font) doom-font)))
t t)) (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)))