From: yamaoka <yamaoka>
Date: Tue, 21 Sep 2004 11:57:23 +0000 (+0000)
Subject: Synch to No Gnus 200409210948.
X-Git-Tag: t-gnus-6_17_4-quimby-~759
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cbf4c3ca1603cb756c7c895caefa5bbcbd57610c;p=elisp%2Fgnus.git-

Synch to No Gnus 200409210948.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8583b0..5ade234 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-20  Simon Josefsson  <jas@extundo.com>
+
+	* mm-util.el (mm-charset-synonym-alist): Map "unicode" to
+	"utf-16-le".
+
 2004-09-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* uudecode.el (uudecode-use-external): Add :version.
diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index d7b9682..50f0bca 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -163,6 +163,10 @@ system object in XEmacs."
 	       (mm-coding-system-p 'cp1250))
 	  '((windows-1250 . cp1250)))
     ;; A Microsoft misunderstanding.
+    ,@(if (and (not (mm-coding-system-p 'unicode))
+	       (mm-coding-system-p 'utf-16-le))
+	  '((unicode . utf-16-le)))
+    ;; A Microsoft misunderstanding.
     ,@(unless (mm-coding-system-p 'ks_c_5601-1987)
 	(if (mm-coding-system-p 'cp949)
 	    '((ks_c_5601-1987 . cp949))