Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-329

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/w32-fns.el
index 81de046,d2cf650..e08b03d
--- 1/lisp/w32-fns.el
--- 2/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@@ -374,14 -374,12 +374,14 @@@ bit output with no translation.
  ;; value from w32-select-font etc, so list the most important charsets last.
  (w32-add-charset-info "iso8859-14" 'w32-charset-ansi  28604)
  (w32-add-charset-info "iso8859-15" 'w32-charset-ansi  28605)
 +;; The following two are included for pattern matching.
 +(w32-add-charset-info "jisx0201" 'w32-charset-shiftjis 932)
 +(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.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 "jisx0208-sjis" 'w32-charset-shiftjis 932)
+ (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,9 -395,9 +397,9 @@@
        (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)))
 +      (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)))
  (if (boundp 'w32-unicode-charset-defined)
      (progn
        (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t))