# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1237424240 0
# Node ID 9b74238fc6c2a38a771e476b0ea80142879a5515
# Parent  0ad88f8fc5a6c586d955589ba4eba159d285fdfd
(w32-initialize-window-system): Call
create-defualt-fontset, not setup-default-fontset.  Call
create-fontset-from-fontset-spec within condition-case.

diff -r 0ad88f8fc5a6 -r 9b74238fc6c2 lisp/term/w32-win.el
--- a/lisp/term/w32-win.el	Thu Mar 19 00:56:52 2009 +0000
+++ b/lisp/term/w32-win.el	Thu Mar 19 00:57:20 2009 +0000
@@ -252,11 +252,15 @@
                      ;; are the initial display
                      (eq initial-window-system 'w32))
 
-  ;; Setup the default fontset.
-  (setup-default-fontset)
-
+  ;; Create the default fontset.
+  (create-default-fontset)
   ;; Create the standard fontset.
-  (create-fontset-from-fontset-spec w32-standard-fontset-spec t)
+  (condition-case err
+      (create-fontset-from-fontset-spec w32-standard-fontset-spec t)
+    (error (display-warning 
+	    'initialization
+	    (format "Creation of the standard fontset failed: %s" err)
+	    :error)))
   ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1,...).
   (create-fontset-from-x-resource)