Fix pre-existing font frame parameter being overwritten

This commit is contained in:
Henrik Lissner 2019-10-28 23:18:07 -04:00
parent 43030c789e
commit 6549a4f982
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -599,12 +599,14 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.")
(defun doom-init-fonts-h ()
"Loads `doom-font'."
(cond (doom-font
(add-to-list
'default-frame-alist
(cl-pushnew
(cons 'font
(cond ((stringp doom-font) doom-font)
((fontp doom-font) (font-xlfd-name doom-font))
((signal 'wrong-type-argument (list '(fontp stringp) doom-font)))))))
((signal 'wrong-type-argument (list '(fontp stringp)
doom-font)))))
default-frame-alist
:key #'car :test #'eq))
((display-graphic-p)
(setq doom-font (face-attribute 'default :font)))))