Mercurial > emacs

diff lisp/gnus/mm-util.el @ 79022:65ad63ddd4f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-115
author Miles Bader <miles@gnu.org>
date Tue, 09 Oct 2007 08:55:58 +0000
parents 24202b793a08
children f4c90d55f00f a3c27999decb bdb3fe0ba9fa
line wrap: on
line diff
--- a/lisp/gnus/mm-util.el	Tue Oct 09 08:39:33 2007 +0000
+++ b/lisp/gnus/mm-util.el	Tue Oct 09 08:55:58 2007 +0000
@@ -256,6 +256,12 @@
     ,@(when (and (not (mm-coding-system-p 'windows-31j))
 		 (mm-coding-system-p 'cp932))
 	'((windows-31j . cp932)))
+    ;; Charset name: GBK, Charset aliases: CP936, MS936, windows-936
+    ;; http://www.iana.org/assignments/charset-reg/GBK
+    ;; Emacs 22.1 has cp936, but not gbk, so we alias it:
+    ,@(when (and (not (mm-coding-system-p 'gbk))
+		 (mm-coding-system-p 'cp936))
+	'((gbk . cp936)))
     )
   "A mapping from unknown or invalid charset names to the real charset names.