# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1194657944 0
# Node ID 30ded86a45002fa3a5010617d43f75b3462852dd
# Parent  8da2b176193772986968d9ada866e468aa67ec59
Enable SJIS fonts before creating any fontsets.

diff -r 8da2b1761937 -r 30ded86a4500 lisp/term/w32-win.el
--- a/lisp/term/w32-win.el	Sat Nov 10 00:28:58 2007 +0000
+++ b/lisp/term/w32-win.el	Sat Nov 10 01:25:44 2007 +0000
@@ -1108,6 +1108,15 @@
     (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 @@
 			      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.