Minor refactor doom|init-fonts

Take advantage of custom-set-faces taking variadic arguments to group
all font-initializing forms in one form.
This commit is contained in:
Henrik Lissner 2018-06-16 00:37:50 +02:00
parent a1278f3dff
commit 33839f54e9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -554,18 +554,18 @@ frame's window-system, the theme will be reloaded.")
(defun doom|init-fonts ()
"Initialize fonts."
(condition-case-unless-debug ex
(progn
(custom-set-faces
(when (fontp doom-font)
(let ((xlfd (font-xlfd-name doom-font)))
(map-put default-frame-alist 'font xlfd)
`(fixed-pitch ((t (:font ,xlfd))))))
(when (fontp doom-variable-pitch-font)
`(variable-pitch ((t (:font ,(font-xlfd-name doom-variable-pitch-font)))))))
`(variable-pitch ((t (:font ,(font-xlfd-name doom-variable-pitch-font))))))
;; Fallback to `doom-unicode-font' for Unicode characters
(when (fontp doom-unicode-font)
(setq use-default-font-for-symbols nil)
(set-fontset-font t 'unicode doom-unicode-font nil)))
(set-fontset-font t 'unicode doom-unicode-font nil)
nil))
('error
(if (string-prefix-p "Font not available: " (error-message-string ex))
(lwarn 'doom-ui :warning