1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 788d012db3b..3e00a81be15 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1480,11 +1480,16 @@ The value nil is the same as this list:
   (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.
-  (create-fontset-from-fontset-spec standard-fontset-spec t)
+  (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)