term/w32-win.el (w32-create-initial-fontsets): Back out previous

change, invoke from before-init-hook.

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 030732a6d2fd577b2782c5a7b392f262d299fb55..7c4e1c2089ab5acbbc72a65d598beb02f489d0b0 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -707,7 +707,11 @@ specified in X resources."
                   (create-fontset-from-fontset-spec
                    (concat fontset ", ascii:" font) styles)
                   )))))
-      (w32-create-initial-fontsets)))
+      ;; This cannot be run yet, as creating fontsets requires a
+      ;; Window to be initialised so the fonts can be listed.
+      ;; Add it to a hook so it gets run later.
+      (add-hook 'before-init-hook 'w32-create-initial-fontsets)
+      ))
 
 ;; Apply a geometry resource to the initial frame.  Put it at the end
 ;; of the alist, so that anything specified on the command line takes