From 6549a4f98254fb5560bee45381b9d73af8f22047 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 28 Oct 2019 23:18:07 -0400 Subject: [PATCH] Fix pre-existing font frame parameter being overwritten --- core/core-ui.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index b9b62aaf2..eb82cb3e5 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -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)))))