Mercurial > emacs

diff lisp/term/x-win.el @ 102639:0ad88f8fc5a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x-initialize-window-system): Call create-defualt-fontset, not setup-default-fontset. Call create-fntset-from-fontset-spec within condition-case.
author Kenichi Handa <handa@m17n.org>
date Thu, 19 Mar 2009 00:56:52 +0000
parents a9dc0e7c3f2b
children b564cde0cb8b
line wrap: on
line diff
--- a/lisp/term/x-win.el	Thu Mar 19 00:55:36 2009 +0000
+++ b/lisp/term/x-win.el	Thu Mar 19 00:56:52 2009 +0000
@@ -1480,11 +1480,16 @@
   (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)