From 0311148f525576eba504b32db202b54a5ef84895 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 19 Mar 2009 00:57:20 +0000 Subject: [PATCH] (w32-initialize-window-system): Call create-defualt-fontset, not setup-default-fontset. Call create-fontset-from-fontset-spec within condition-case. --- lisp/term/w32-win.el | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index da3fab0132a..4b8d48ce16b 100644 --- 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) -- 2.39.5