diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-11-10 01:30:33 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-11-10 01:30:33 +0000 |
| commit | 1adf362df743044230329213bf68ff1e3acdd5e4 (patch) | |
| tree | 3c7b8f73d614af68cb073c5f3ea4a7a8dad1386e | |
| parent | d725608c0ecfdb7328b5ec49c06f508e18ab6dcd (diff) | |
| download | emacs-1adf362df743044230329213bf68ff1e3acdd5e4.tar.gz | |
(w32-initialize-window-system): Move SJIS font setup here from global scope.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae30079d91b..21fcc5a47de 100644 --- 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 6a2ea13be38..4a3a685f8c0 100644 --- 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,...). |