From: Geoff Voelker <voelker@cs.washington.edu>
Date: Tue, 2 Feb 1999 02:57:50 +0000 (+0000)
Subject: term/w32-win.el (w32-create-initial-fontsets): Back out previous
X-Git-Tag: emacs-20.4~703
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d0b2488316a716af42ede7e15c66aea13e5229f;p=emacs.git

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 030732a6d2f..7c4e1c2089a 100644
--- 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