From: Jason Rumney Date: Thu, 31 Jan 2008 23:34:48 +0000 (+0000) Subject: Partially revert 2007-11-10 change. X-Git-Tag: emacs-pretest-22.1.91~110 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=751be31e6cb82901c6156c2c1971a8ca1f7e0a66;p=emacs.git Partially revert 2007-11-10 change. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed8eb06550b..8537c0fbdb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-31 Jason Rumney + + * w32-fns.el: Partially revert 2007-11-10 change. + 2008-01-31 Martin Rudalics * mail/rmail.el (rmail-highlight): Fix specification. diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 9819ad4e442..b912c031621 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.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 "ksc5601.1989" 'w32-charset-hangeul 949) +(w32-add-charset-info "big5" 'w32-charset-chinesebig5 950) +(w32-add-charset-info "gb2312.1980" '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,8 +397,8 @@ 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-1" 'w32-charset-thai 874) - (w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361) + (w32-add-charset-info "tis620" 'w32-charset-thai 874) + (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) (w32-add-charset-info "mac-latin" 'w32-charset-mac nil))) (if (boundp 'w32-unicode-charset-defined) (progn