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

[Kenichi Handa]

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

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

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/x-win.el?cvsroot=emacs&r1=1.239&r2=1.240

Patches:
Index: x-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- x-win.el    5 Jan 2009 03:23:58 -0000       1.239
+++ x-win.el    19 Mar 2009 00:56:52 -0000      1.240
@@ -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.
+  (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)