Synch to No Gnus 200406290509.

[elisp/gnus.git-] / lisp / mm-util.el

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 36b4602..7913ac1 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -232,6 +232,7 @@ system object in XEmacs."
     (big5 chinese-big5-1 chinese-big5-2)
     (tibetan tibetan)
     (thai-tis620 thai-tis620)
+    (windows-1251 cyrillic-iso8859-5)
     (iso-2022-7bit ethiopic arabic-1-column arabic-2-column)
     (iso-2022-jp-2 latin-iso8859-1 greek-iso8859-7
                   latin-jisx0201 japanese-jisx0208-1978
@@ -544,9 +545,12 @@ This affects whether coding conversion should be attempted generally."
        (not inconvertible))))
 
 (defun mm-sort-coding-systems-predicate (a b)
-  (let ((priorities (mapcar 'mm-coding-system-p
-                           ;; Note: invalid entries are dropped silently
-                           mm-coding-system-priorities)))
+  (let ((priorities
+        (mapcar (lambda (cs)
+                  ;; Note: invalid entries are dropped silently
+                  (and (setq cs (mm-coding-system-p cs))
+                       (coding-system-base cs)))
+                mm-coding-system-priorities)))
     (and (setq a (mm-coding-system-p a))
         (if (setq b (mm-coding-system-p b))
             (> (length (memq (coding-system-base a) priorities))