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

[Kenichi Handa]

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

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

Log message:
        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/ns-win.el?cvsroot=emacs&r1=1.38&r2=1.39

Patches:
Index: ns-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- ns-win.el   14 Mar 2009 21:20:00 -0000      1.38
+++ ns-win.el   19 Mar 2009 00:57:57 -0000      1.39
@@ -1179,9 +1179,14 @@
 (if (fboundp 'new-fontset)
     (progn
       ;; Setup the default fontset.
-      (setup-default-fontset)
+      (create-default-fontset)
       ;; Create the standard fontset.
-      (create-fontset-from-fontset-spec ns-standard-fontset-spec t)))
+      (condition-case err
+         (create-fontset-from-fontset-spec ns-standard-fontset-spec t)
+       (error (display-warning 
+               'initialization
+               (format "Creation of the standard fontset failed: %s" err)
+               :error)))))
 
 ;;(push (cons 'font "-ns-*-*-*-*-*-10-*-*-*-*-*-fontset-standard")
 ;;      default-frame-alist)