# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1042791254 0
# Node ID 7f09b406bc3c88e76b736b472149e600c0721de6
# Parent  5cb7e71032964ac20bc16cff7b426f3c2fccfc33
Require fontset unconditionally again.
Call setup-default-fontset at the top level.

diff -r 5cb7e7103296 -r 7f09b406bc3c lisp/term/x-win.el
--- a/lisp/term/x-win.el	Fri Jan 17 08:13:39 2003 +0000
+++ b/lisp/term/x-win.el	Fri Jan 17 08:14:14 2003 +0000
@@ -75,8 +75,7 @@
 (require 'faces)
 (require 'select)
 (require 'menu-bar)
-(if (fboundp 'new-fontset)
-    (require 'fontset))
+(require 'fontset)
 
 (defvar x-invocation-args)
 
@@ -2268,6 +2267,9 @@
 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100)
 			    x-cut-buffer-max))
 
+;; Setup the default fontset.
+(setup-default-fontset)
+
 ;; Create the standard fontset.
 (create-fontset-from-fontset-spec standard-fontset-spec t)