Ignore +doom-unicode-font if :feature unicode is active

This commit is contained in:
Henrik Lissner 2017-06-08 14:21:51 +02:00
parent 6d905240c0
commit b4e454823f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -13,7 +13,7 @@
(defvar +doom-unicode-font (defvar +doom-unicode-font
(font-spec :family "DejaVu Sans Mono" :size 12) (font-spec :family "DejaVu Sans Mono" :size 12)
"Fallback font for unicode glyphs.") "Fallback font for unicode glyphs. Is ignored if :feature unicode is active.")
;;; Set fonts ;;; Set fonts
@ -21,8 +21,9 @@
(with-demoted-errors "FONT ERROR: %s" (with-demoted-errors "FONT ERROR: %s"
(set-frame-font +doom-font t t) (set-frame-font +doom-font t t)
;; Fallback to `doom-unicode-font' for Unicode characters ;; Fallback to `doom-unicode-font' for Unicode characters
(when +doom-unicode-font (unless (featurep! :feature unicode)
(set-fontset-font t 'unicode +doom-unicode-font)) (when +doom-unicode-font
(set-fontset-font t 'unicode +doom-unicode-font)))
;; ...and for variable-pitch mode ;; ...and for variable-pitch mode
(when +doom-variable-pitch-font (when +doom-variable-pitch-font
(set-face-attribute 'variable-pitch nil :font +doom-variable-pitch-font)))) (set-face-attribute 'variable-pitch nil :font +doom-variable-pitch-font))))