(mm-charset-synonym-alist): Add bogus names "UTF8" and "ISO_8859-1".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0dace7d..d9deb48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-12-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * mm-util.el (mm-charset-synonym-alist): Add bogus names "UTF8" and
+       "ISO_8859-1".
+
        * gnus-start.el (gnus-backup-startup-file): Improve doc string.
 
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index e6f0f26..7e9f0ca 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/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.