# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1237424277 0
# Node ID 507916bdf147199bbee92ec428c23ad272bd4f2f
# Parent  9b74238fc6c2a38a771e476b0ea80142879a5515
Call create-defualt-fontset, not
setup-default-fontset.  Call create-fontset-from-fontset-spec
within condition-case.

diff -r 9b74238fc6c2 -r 507916bdf147 lisp/term/ns-win.el
--- a/lisp/term/ns-win.el	Thu Mar 19 00:57:20 2009 +0000
+++ b/lisp/term/ns-win.el	Thu Mar 19 00:57:57 2009 +0000
@@ -1179,9 +1179,14 @@
 (if (fboundp 'new-fontset)
     (progn
       ;; Setup the default fontset.
-      (setup-default-fontset)
+      (create-default-fontset)
       ;; Create the standard fontset.
-      (create-fontset-from-fontset-spec ns-standard-fontset-spec t)))
+      (condition-case err
+	  (create-fontset-from-fontset-spec ns-standard-fontset-spec t)
+	(error (display-warning 
+		'initialization
+		(format "Creation of the standard fontset failed: %s" err)
+		:error)))))
 
 ;;(push (cons 'font "-ns-*-*-*-*-*-10-*-*-*-*-*-fontset-standard")
 ;;      default-frame-alist)