(rmail-convert-to-babyl-format): Use second group from

`rmail-mime-charset-pattern'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22690ba26949f9c062e9287d7f9c6ce9829f1347..ed4d769906c44f343205314f1bbd8bbeb4cdcb99 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Romain Francoise  <romain@orebokech.com>
+
+       * mail/rmail.el (rmail-convert-to-babyl-format): Use second group
+       from `rmail-mime-charset-pattern'.
+
 2006-04-18  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/python.el (python-mode): Fix typo.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a400efc5cc8486ef57bead59f87a0c84ae81e19c..faeec5abf02997ebba1117ef39f58bfec9fa210e 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1994,7 +1994,7 @@ is non-nil if the user has supplied the password interactively.
                                           (re-search-backward
                                            rmail-mime-charset-pattern
                                            start t))))
-                                 (intern (downcase (match-string 1))))))
+                                 (intern (downcase (match-string 2))))))
                         (rmail-decode-region start (point) mime-charset)))))
               ;; Add an X-Coding-System: header if we don't have one.
               (save-excursion
@@ -2155,7 +2155,7 @@ is non-nil if the user has supplied the password interactively.
                                       (re-search-backward
                                        rmail-mime-charset-pattern
                                        start t))))
-                             (intern (downcase (match-string 1))))))
+                             (intern (downcase (match-string 2))))))
                     (rmail-decode-region start (point) mime-charset)))
               (save-excursion
                 (goto-char start)