diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-11-10 01:47:45 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-11-10 01:47:45 +0000 |
| commit | 1e013b133685df245f4ee248d6f51bb2d2f36797 (patch) | |
| tree | 867d8715e22051fcebb96c2ed85d61aaf966ed77 | |
| parent | 756d09c83fe7c2796bfd2f0203ef3288da55e7b6 (diff) | |
| download | emacs-1e013b133685df245f4ee248d6f51bb2d2f36797.tar.gz | |
Sync charset names with setup-default-fontset.
Append "-1" where second part missing.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d169916dc6..4b45a9afe87 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2007-11-10 Jason Rumney <jasonr@gnu.org> + * w32-fns.el: Sync charset names with setup-default-fontset. + Append "-1" where second part missing. + * term/w32-win.el: Enable SJIS fonts before creating any fontsets. 2007-11-10 Juanma Barranquero <lekktu@gmail.com> diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index f37b4dcb789..6826cc47f86 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -379,9 +379,9 @@ bit output with no translation." (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) -(w32-add-charset-info "ksc5601.1987" 'w32-charset-hangeul 949) -(w32-add-charset-info "big5" 'w32-charset-chinesebig5 950) -(w32-add-charset-info "gb2312" 'w32-charset-gb2312 936) +(w32-add-charset-info "ksc5601.1989-1" 'w32-charset-hangeul 949) +(w32-add-charset-info "big5-1" 'w32-charset-chinesebig5 950) +(w32-add-charset-info "gb2312.1980-1" 'w32-charset-gb2312 936) (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil) (w32-add-charset-info "ms-oem" 'w32-charset-oem 437) (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850) @@ -397,12 +397,11 @@ bit output with no translation." (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) - (w32-add-charset-info "tis620" 'w32-charset-thai 874) - (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) - (w32-add-charset-info "mac" 'w32-charset-mac nil))) + (w32-add-charset-info "tis620-1" 'w32-charset-thai 874) + (w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361) + (w32-add-charset-info "mac-latin" 'w32-charset-mac nil))) (if (boundp 'w32-unicode-charset-defined) (progn - (w32-add-charset-info "unicode" 'w32-charset-unicode t) (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)) ;; If unicode windows charset is not defined, use ansi fonts. (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) |