From: yamaoka <yamaoka>
Date: Mon, 10 Feb 2003 00:51:29 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~75
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a06227e45b98dea131ba2549f69b57038125cdf9;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8316c38..e5e5974 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-10  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-util.el (mm-mule-charset-to-mime-charset): Use
+	sort-coding-systems to prefer utf-8 over utf-16.
+
 2002-02-09  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
 	* gnus-agent.el (gnus-agent-expire-days):
diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 80fb3f2..85c44f1 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -303,7 +303,9 @@ mail with multiple parts is preferred to sending a Unicode one.")
   "Return the MIME charset corresponding to the given Mule CHARSET."
   (if (fboundp 'find-coding-systems-for-charsets)
       (let (mime)
-	(dolist (cs (find-coding-systems-for-charsets (list charset)))
+	(dolist (cs (sort-coding-systems
+		     (copy-sequence
+		      (find-coding-systems-for-charsets (list charset)))))
 	  (unless mime
 	    (when cs
 	      (setq mime (coding-system-get cs 'mime-charset)))))