Call create-defualt-fontset, not

setup-default-fontset.  Call create-fontset-from-fontset-spec
within condition-case.

2 files changed, 25 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6164a1e2319..051e0703bd3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2009-03-19  Kenichi Handa  <handa@m17n.org>
+
+        * term/ns-win.el: Call create-defualt-fontset, not
+        setup-default-fontset.  Call create-fontset-from-fontset-spec
+        within condition-case.
+
+        * term/w32-win.el (w32-initialize-window-system): Call
+        create-defualt-fontset, not setup-default-fontset.  Call
+        create-fontset-from-fontset-spec within condition-case.
+
+        * term/x-win.el (x-initialize-window-system): Call
+        create-defualt-fontset, not setup-default-fontset.  Call
+        create-fontset-from-fontset-spec within condition-case.
+
+        * international/fontset.el (create-default-fontset): New function.
+        (create-fontset-from-x-resource): Use display-warning instead of
+        message.
+
 2009-03-18  Richard M Stallman  <rms@gnu.org>
 
         * mail/rmail.el (rmail-retry-ignored-headers): Add usual mime headers.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index a5acf70301f..0786714c538 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1179,9 +1179,14 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
 (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)