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

if it is available.  (bug#5647)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0a6a6a888bdb9a8a065fb08d02e53dfc6af1bde7..02a8513643f49548bd9acf406eb77baadbcde4cf 100644 (file)
--- 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 8dc232e757297739c116bc9c65a6b441ef99d692..aa2be153b0f95f0d1e7adc1be594c2ba81582249 100644 (file)
--- 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))