(mm-charset-to-coding-system): Use coding-system-from-name

if it is available.  (bug#5647)

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0a6a6a888bd..02a8513643f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name
+        if it is available.  (bug#5647)
+
 2010-02-26  Glenn Morris  <rgm@gnu.org>
 
         * message.el (message-send-mail-function): Change the default, so that
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 8dc232e7572..aa2be153b0f 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -566,6 +566,9 @@ is not available."
 ;;;      (eq charset (coding-system-get charset 'mime-charset))
          )
     charset)
+   ;; Use coding system Emacs knows.
+   ((and (fboundp 'coding-system-from-name)
+         (coding-system-from-name charset)))
    ;; Eval expressions from `mm-charset-eval-alist'
    ((let* ((el (assq charset mm-charset-eval-alist))
            (cs (car el))