diff options
| author | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/w32-fns.el | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.bz2 emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/w32-fns.el')
| -rw-r--r-- | lisp/w32-fns.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 26bebe040e0..994eb767232 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -384,9 +384,9 @@ bit output with no translation." (w32-add-charset-info "jisx0208" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0201-katakana" '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) @@ -402,12 +402,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 "tis620-1" 'w32-charset-thai 874) + (w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361) (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) (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)) (w32-add-charset-info "iso10646-1" 'w32-charset-default t)) ;; ;; If unicode windows charset is not defined, use ansi fonts. |