[Emacs-diffs] emacs/lisp/international fontset.el

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/03/19 00:55:37

Modified files:
        lisp/international: fontset.el 

Log message:
        (create-default-fontset): New function.
        (create-fontset-from-x-resource): Use display-warning instead of
        message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/fontset.el?cvsroot=emacs&r1=1.97&r2=1.98

Patches:
Index: fontset.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/fontset.el,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- fontset.el  5 Feb 2009 07:09:47 -0000       1.97
+++ fontset.el  19 Mar 2009 00:55:36 -0000      1.98
@@ -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)))))
 
 ;;