don't remove spw/do-font-setup hook until first graphical frame

1 files changed, 19 insertions, 17 deletions

diff --git a/.emacs.d/init-spw.el b/.emacs.d/init-spw.el
index f4d81b35..e49aedfb 100644
--- a/.emacs.d/init-spw.el
+++ b/.emacs.d/init-spw.el
@@ -116,23 +116,25 @@ add places the library might be available to `load-path'."
   (buffer-face-set
    (face-remap-add-relative 'default :family "Cousine" :height 100)))
 (defun spw/do-font-setup ()
-  (remove-hook 'focus-in-hook #'spw/do-font-setup) ; harmless if hook absent
-  (when-let ((latin-font (spw/first-available-font spw/preferred-latin-fonts)))
-    (set-face-font 'default latin-font))
-  (when-let ((han-font (spw/first-available-font spw/preferred-han-fonts)))
-    (dolist (charset '(kana han symbol cjk-misc bopomofo))
-      (set-fontset-font t charset han-font)))
-  (when-let ((hangul-font
-              (spw/first-available-font spw/preferred-hangul-fonts)))
-    (set-fontset-font t 'hangul hangul-font))
-
-  ;; again on laptop, need to fit a bit more in these windows than can
-  ;; with Inconsolata
-  (when (find-font (font-spec :name "Cousine-10"))
-    (dolist (pair '((org . org-mode-hook)
-                    (org-agenda . org-agenda-mode-hook)))
-      (eval-after-load (car pair)
-        `(add-hook ',(cdr pair) #'spw/select-cousine)))))
+  (when (display-graphic-p)
+    (remove-hook 'focus-in-hook #'spw/do-font-setup) ; harmless if hook absent
+    (when-let ((latin-font
+                (spw/first-available-font spw/preferred-latin-fonts)))
+      (set-face-font 'default latin-font))
+    (when-let ((han-font (spw/first-available-font spw/preferred-han-fonts)))
+      (dolist (charset '(kana han symbol cjk-misc bopomofo))
+        (set-fontset-font t charset han-font)))
+    (when-let ((hangul-font
+                (spw/first-available-font spw/preferred-hangul-fonts)))
+      (set-fontset-font t 'hangul hangul-font))
+
+    ;; again on laptop, need to fit a bit more in these windows than can
+    ;; with Inconsolata
+    (when (find-font (font-spec :name "Cousine-10"))
+      (dolist (pair '((org . org-mode-hook)
+                      (org-agenda . org-agenda-mode-hook)))
+        (eval-after-load (car pair)
+          `(add-hook ',(cdr pair) #'spw/select-cousine))))))
 
 ;; `find-font' will fail until there is a graphical frame, which might
 ;; not be yet, so set up a hook (which will remove itself after