From 2b22982c2cc4bc13bff717bef2a7697a7b35e213 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 21 Oct 2021 14:26:08 -0700 Subject: [PATCH] [oni-gui] Always setup faces immediately MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the functions called in ‘oni-gui-setup-faces’ work on either the given frame or, if given ‘nil’, all future frames, it shouldn’t be a problem to call it when the Emacs daemon is starting. And since my main org file is loaded before a frame is created, it doesn’t use the right font otherwise. --- oni-gui.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/oni-gui.el b/oni-gui.el index 2a52026..a586d61 100644 --- a/oni-gui.el +++ b/oni-gui.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2021.0911.025144 +;; Version: 2021.1021.142026 ;; Package-Requires: (oni-ui oni-hydra yoshi-theme diminish) ;; This program is free software; you can redistribute it and/or modify @@ -115,11 +115,10 @@ _bi_: Auto Insert ^^ ^^ (if (daemonp) (progn (add-hook 'after-make-frame-functions #'oni-gui-setup-fontsets) - (add-hook 'after-make-frame-functions #'oni-gui-setup-ligatures) - (add-hook 'after-make-frame-functions #'oni-gui-setup-faces)) + (add-hook 'after-make-frame-functions #'oni-gui-setup-ligatures)) (oni-gui-setup-fontsets nil) - (oni-gui-setup-ligatures) - (oni-gui-setup-faces nil)) + (oni-gui-setup-ligatures)) +(oni-gui-setup-faces nil) (global-unset-key (kbd "C-z")) (global-set-key (kbd "C-c c") 'oni-gui-hydra/body)