[Emacs-diffs] Changes to emacs/lisp/term/w32-win.el, v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   07/11/10 01:25:44

Index: w32-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/w32-win.el,v
retrieving revision 1.80.2.2
retrieving revision 1.80.2.3
diff -u -b -r1.80.2.2 -r1.80.2.3
--- w32-win.el  25 Jul 2007 04:23:07 -0000      1.80.2.2
+++ w32-win.el  10 Nov 2007 01:25:44 -0000      1.80.2.3
@@ -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.