# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1237424136 0
# Node ID 6f3f8314ba7516c2db597895ed8fee244465c4a9
# Parent  7780afc47c491e268b2f53d8d114de92f4f91b7b
(create-default-fontset): New function.
(create-fontset-from-x-resource): Use display-warning instead of
message.

diff -r 7780afc47c49 -r 6f3f8314ba75 lisp/international/fontset.el
--- a/lisp/international/fontset.el	Thu Mar 19 00:46:35 2009 +0000
+++ b/lisp/international/fontset.el	Thu Mar 19 00:55:36 2009 +0000
@@ -579,6 +579,16 @@
 
   (set-fontset-font "fontset-default" '(#xE000 . #xF8FF) nil))
 
+(defun create-default-fontset ()
+  "Create the default fontset.
+Internal use only.  Should be called at startup time."
+  (condition-case err
+      (setup-default-fontset)
+    (error (display-warning
+	    'initialization
+	    (format "Creation of the default fontsets failed: %s" err)
+	    :error))))
+
 ;; These are the registered registries/encodings from
 ;; ftp://ftp.x.org/pub/DOCS/registry 2001/06/01
 
@@ -1049,8 +1059,11 @@
     (while (setq fontset-spec (x-get-resource (format "fontset-%d" idx)
 					      (format "Fontset-%d" idx)))
       (condition-case nil
-	  (create-fontset-from-fontset-spec fontset-spec t 'noerror)
-	(error (message "Fontset-%d: invalid specification in X resource" idx)))
+	  (create-fontset-from-fontset-spec fontset-spec t)
+	(error (display-warning
+		'initialization
+		(format "Fontset-%d: invalid specification in X resource" idx)
+		:warning)))
       (setq idx (1+ idx)))))
 
 ;;