diff options
| author | Miles Bader <miles@gnu.org> | 2008-12-17 00:34:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-12-17 00:34:16 +0000 |
| commit | bf46b4d4282fd8411876052b759eab7891d0fba9 (patch) | |
| tree | 58e01f1825c98a72a70c2ff2af1e2f947711c3e0 /lisp/gnus/mm-util.el | |
| parent | 35f372cadfaf129d62e81951d4516c687b67d189 (diff) | |
| download | emacs-bf46b4d4282fd8411876052b759eab7891d0fba9.tar.gz | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1500
Diffstat (limited to 'lisp/gnus/mm-util.el')
| -rw-r--r-- | lisp/gnus/mm-util.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 1d23050b364..1c28f375db0 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -269,10 +269,18 @@ the alias. Else windows-NUMBER is used." ,@(when (and (not (mm-coding-system-p 'gbk)) (mm-coding-system-p 'cp936)) '((gbk . cp936))) + ;; UTF8 is a bogus name for UTF-8 + ,@(when (and (not (mm-coding-system-p 'utf8)) + (mm-coding-system-p 'utf-8)) + '((utf8 . utf-8))) ;; ISO8859-1 is a bogus name for ISO-8859-1 ,@(when (and (not (mm-coding-system-p 'iso8859-1)) (mm-coding-system-p 'iso-8859-1)) '((iso8859-1 . iso-8859-1))) + ;; ISO_8859-1 is a bogus name for ISO-8859-1 + ,@(when (and (not (mm-coding-system-p 'iso_8859-1)) + (mm-coding-system-p 'iso-8859-1)) + '((iso_8859-1 . iso-8859-1))) ) "A mapping from unknown or invalid charset names to the real charset names. |