Enable SJIS fonts before creating any fontsets.

2 files changed, 13 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d1679b128c..3d169916dc6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-10  Jason Rumney  <jasonr@gnu.org>
+
+        * term/w32-win.el: Enable SJIS fonts before creating any fontsets.
+
 2007-11-10  Juanma Barranquero  <lekktu@gmail.com>
 
         * ido.el (ido-save-history): Write the history file in UTF-8,
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index dfe94aaf133..86d8d6560d2 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1108,6 +1108,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
     (progn
       ;; Setup the default fontset.
       (setup-default-fontset)
+      ;; Enable Japanese fonts on Windows to be used by default.
+      (set-fontset-font nil (make-char 'katakana-jisx0201)
+                        '("*" . "JISX0208-SJIS"))
+      (set-fontset-font nil (make-char 'latin-jisx0201)
+                        '("*" . "JISX0208-SJIS"))
+      (set-fontset-font nil (make-char 'japanese-jisx0208)
+                        '("*" . "JISX0208-SJIS"))
+      (set-fontset-font nil (make-char 'japanese-jisx0208-1978)
+                        '("*" . "JISX0208-SJIS"))
       ;; Create the standard fontset.
       (create-fontset-from-fontset-spec w32-standard-fontset-spec t)
       ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1,...).
@@ -1209,12 +1218,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
                               nil nil default))))
     (list face (if (equal value "") nil value))))
 
-;;; Enable Japanese fonts on Windows to be used by default.
-(set-fontset-font nil (make-char 'katakana-jisx0201) '("*" . "JISX0208-SJIS"))
-(set-fontset-font nil (make-char 'latin-jisx0201) '("*" . "JISX0208-SJIS"))
-(set-fontset-font nil (make-char 'japanese-jisx0208) '("*" . "JISX0208-SJIS"))
-(set-fontset-font nil (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS"))
-
 (defun mouse-set-font (&rest fonts)
   "Select an Emacs font from a list of known good fonts and fontsets.