(w32-initialize-window-system): Call

create-defualt-fontset, not setup-default-fontset.  Call
create-fontset-from-fontset-spec within condition-case.

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index da3fab0132a25edecac72891026e72c44a8e5471..4b8d48ce16b66540d17d6f53a2aab47704f5fb71 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -252,11 +252,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
                      ;; 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.
-  (create-fontset-from-fontset-spec w32-standard-fontset-spec t)
+  (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)