diff options
| author | Jason Rumney | 2009-03-11 15:15:09 +0000 |
|---|---|---|
| committer | Jason Rumney | 2009-03-11 15:15:09 +0000 |
| commit | 4603334027d0b48633eb152c48b64b4b97eac582 (patch) | |
| tree | 7f981b31a3807db035edee1836e0dadb624d28f5 | |
| parent | ff85581a0fac99e42fdc6b2d1e2819afced9769f (diff) | |
| download | emacs-4603334027d0b48633eb152c48b64b4b97eac582.tar.gz emacs-4603334027d0b48633eb152c48b64b4b97eac582.zip | |
(w32-initialize-window-system): Don't override
Japanese font settings.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 231369e36a5..fd4d8ef5475 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-03-11 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * term/w32-win.el (w32-initialize-window-system): Don't override | ||
| 4 | Japanese font settings. | ||
| 5 | |||
| 1 | 2009-03-11 Glenn Morris <rgm@gnu.org> | 6 | 2009-03-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * mail/rmailedit.el (rmail-edit-mode): | 8 | * mail/rmailedit.el (rmail-edit-mode): |
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index e0307687777..7555748fee3 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -256,16 +256,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 256 | ;; Setup the default fontset. | 256 | ;; Setup the default fontset. |
| 257 | (setup-default-fontset) | 257 | (setup-default-fontset) |
| 258 | 258 | ||
| 259 | ;; Enable Japanese fonts on Windows to be used by default. | ||
| 260 | (set-fontset-font t (make-char 'katakana-jisx0201) | ||
| 261 | '("*" . "JISX0208-SJIS")) | ||
| 262 | (set-fontset-font t (make-char 'latin-jisx0201) | ||
| 263 | '("*" . "JISX0208-SJIS")) | ||
| 264 | (set-fontset-font t (make-char 'japanese-jisx0208) | ||
| 265 | '("*" . "JISX0208-SJIS")) | ||
| 266 | (set-fontset-font t (make-char 'japanese-jisx0208-1978) | ||
| 267 | '("*" . "JISX0208-SJIS")) | ||
| 268 | |||
| 269 | ;; Create the standard fontset. | 259 | ;; Create the standard fontset. |
| 270 | (create-fontset-from-fontset-spec w32-standard-fontset-spec t) | 260 | (create-fontset-from-fontset-spec w32-standard-fontset-spec t) |
| 271 | ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1,...). | 261 | ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1,...). |