From: Kenichi Handa <handa@m17n.org>
Date: Thu, 19 Mar 2009 00:56:52 +0000 (+0000)
Subject: (x-initialize-window-system): Call
X-Git-Tag: emacs-pretest-23.0.92~136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d4e20ecbe2a63979f3b40aa81c85fffc358044b;p=emacs.git

(x-initialize-window-system): Call
create-defualt-fontset, not setup-default-fontset.  Call
create-fntset-from-fontset-spec within condition-case.
---

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 788d012db3b..3e00a81be15 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1480,11 +1480,16 @@ The value nil is the same as this list:
   (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 default fontset.
+  (create-default-fontset)
 
   ;; Create the standard fontset.
-  (create-fontset-from-fontset-spec standard-fontset-spec t)
+  (condition-case err
+	(create-fontset-from-fontset-spec 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)