diff options
| author | Dave Love <fx@gnu.org> | 2001-03-05 13:37:38 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2001-03-05 13:37:38 +0000 |
| commit | f891ed299cc15f13aaaa91bb462f9ec9c67ba914 (patch) | |
| tree | 9e561801d90c3f45f44f36a9c194fb4540ae0b5e /lisp/gnus | |
| parent | 75dfe99079aef4ccf1dacd4acd59f444e8e922a3 (diff) | |
| download | emacs-f891ed299cc15f13aaaa91bb462f9ec9c67ba914.tar.gz emacs-f891ed299cc15f13aaaa91bb462f9ec9c67ba914.tar.bz2 emacs-f891ed299cc15f13aaaa91bb462f9ec9c67ba914.zip | |
(mm-mime-mule-charset-alist): Fix utf-8 case.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 87d82af3a9e..b83a2db2550 100644 --- 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 d0b1eef3321..a7a14f7ae01 100644 --- 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 |