(mm-mime-mule-charset-alist): Fix utf-8 case.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 87d82af3a9ed84eedfb87ca9acbf975d98ef9144..b83a2db2550cc58698897d1396aafc56ff128d89 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-05  Dave Love  <fx@gnu.org>
+
+       * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case.
+
 2001-03-01  Dave Love  <fx@gnu.org>
 
        * mm-util.el (mm-inhibit-file-name-handlers): Add

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index d0b1eef332154f697e16769aad842598a619f076..a7a14f7ae01930152f0ef50fe695b7dc5179ab1f 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -71,11 +71,12 @@
                    chinese-cns11643-3 chinese-cns11643-4
                    chinese-cns11643-5 chinese-cns11643-6
                    chinese-cns11643-7)
-    ,(if (or (charsetp 'unicode-a)
-            (not (coding-system-p 'mule-utf-8)))
-        '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)
-       ;; If we have utf-8 we're in Mule 5+.
-       (delete 'ascii (coding-system-get 'mule-utf-8 'safe-charsets))))
+    ;; utf-8 comes either from Mule-UCS or Mule 5+.
+    ,@(if (mm-coding-system-p 'utf-8)
+         (list (cons 'utf-8 (delete 'ascii
+                                    (coding-system-get
+                                     'mule-utf-8
+                                     'safe-charsets))))))
   "Alist of MIME-charset/MULE-charsets.")
 
 (eval-and-compile