[Emacs-diffs] emacs/lisp/term w32-win.el

[Kenichi Handa]

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

Modified files:
        lisp/term      : w32-win.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/w32-win.el?cvsroot=emacs&r1=1.110&r2=1.111

Patches:
Index: w32-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/w32-win.el,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- w32-win.el  11 Mar 2009 15:59:33 -0000      1.110
+++ w32-win.el  19 Mar 2009 00:57:20 -0000      1.111
@@ -252,11 +252,15 @@
                      ;; are the initial display
                      (eq initial-window-system 'w32))
 
-  ;; Setup the default fontset.
-  (setup-default-fontset)
-
+  ;; Create the default fontset.
+  (create-default-fontset)
   ;; Create the standard fontset.
+  (condition-case err
   (create-fontset-from-fontset-spec w32-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)