From 5f7add83605a52dd8387e918ae38870a55e6189e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 20 Sep 2019 19:51:42 -0400 Subject: [PATCH] Update doom/reload-{theme,font} To reflect changes introduced in 17174e143 --- core/autoload/fonts.el | 3 ++- core/autoload/themes.el | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/autoload/fonts.el b/core/autoload/fonts.el index 6a17919e2..0c2cfd6cc 100644 --- a/core/autoload/fonts.el +++ b/core/autoload/fonts.el @@ -72,7 +72,8 @@ See `doom-init-fonts-h'." (interactive) (when doom-font (set-frame-font doom-font t)) - (mapc #'doom-init-fonts-h (frame-list))) + (doom-init-fonts-h) + (mapc #'doom-init-extra-fonts-h (frame-list))) ;;;###autoload (defun doom/increase-font-size (count) diff --git a/core/autoload/themes.el b/core/autoload/themes.el index 475de2816..6000e4c4c 100644 --- a/core/autoload/themes.el +++ b/core/autoload/themes.el @@ -44,7 +44,5 @@ face format." (let ((theme (or (car-safe custom-enabled-themes) doom-theme))) (when theme (mapc #'disable-theme custom-enabled-themes)) - (when (and doom-theme (not (memq doom-theme custom-enabled-themes))) - (let (doom--prefer-theme-elc) - (load-theme doom-theme t))) - (doom-init-fonts-h))) + (load-theme doom-theme 'noconfirm) + (doom/reload-font)))