(w32-initialize-window-system): Move SJIS font setup here from global scope.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae30079d91b25462e854141423f34d7e4141ae3d..21fcc5a47dead4f3b624f85282982f5248eeeef6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-10  Jason Rumney  <jasonr@gnu.org>
+
+       * term/w32-win.el (w32-initialize-window-system): Move SJIS font
+       setup here from global scope.
+
 2007-11-10  Juanma Barranquero  <lekktu@gmail.com>
 
        * ido.el (ido-save-history): Save the history file in UTF-8, not

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 6a2ea13be385fd3a9247dc8423bafaa7da366691..4a3a685f8c0733b8dcdebb9c5e869e12d4505e6e 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1083,12 +1083,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   (error "Suspending an Emacs running under W32 makes no sense"))
 
 
-;;; 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.
 
@@ -1159,6 +1153,17 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
 
   ;; 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,...).