(mm-sort-coding-systems-predicate): Convert elements

of `mm-coding-system-priorities' to base coding system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23f3223..32b7fd9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2003-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * mm-util.el (mm-sort-coding-systems-predicate): Convert elements
+       of `mm-coding-system-priorities' to base coding system.
+
        * gnus-sum.el: Added coding cookie ("middle dot" in
        gnus-summary-morse-message).
 

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index a705b82..921f7a1 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -502,8 +502,14 @@ If the charset is `composition', return the actual one."
        (not inconvertible))))
 
 (defun mm-sort-coding-systems-predicate (a b)
-  (> (length (memq a mm-coding-system-priorities))
-     (length (memq b mm-coding-system-priorities))))
+  (let ((priorities
+        (mapcar (lambda (cs)
+                  ;; Note: invalid entries are dropped silently
+                  (and (coding-system-p cs)
+                       (coding-system-base cs)))
+                mm-coding-system-priorities)))
+    (> (length (memq a priorities))
+       (length (memq b priorities)))))
 
 (defun mm-find-mime-charset-region (b e &optional hack-charsets)
   "Return the MIME charsets needed to encode the region between B and E.