Changes committed gnus/lisp (ChangeLog mm-util.el)

"Reiner Steib" <[email protected]> Mon, 15 Dec 2008 20:44:47 +0100
Newsgroups gmane.emacs.gnus.commits
Message-ID <[email protected]>
Modified: ChangeLog mm-util.el

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1942 gnus/lisp/ChangeLog:7.1943
--- ChangeLog:7.1942	Mon Dec 15 20:38:22 2008
+++ ChangeLog	Mon Dec 15 20:44:47 2008
@@ -1,5 +1,8 @@
 2008-12-15  Reiner Steib  <[email protected]>
 
+	* 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  <[email protected]>
Index: mm-util.el
diff -u gnus/lisp/mm-util.el:7.82 gnus/lisp/mm-util.el:7.83
--- mm-util.el:7.82	Mon Dec 15 05:15:59 2008
+++ mm-util.el	Mon Dec 15 20:44:47 2008
@@ -269,10 +269,18 @@
     ,@(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.