(rmail-mime-charset-pattern): Add "?:" before "format".

(rmail-convert-to-babyl-format): Undo the change from 2006-04-19.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a238259..cce330a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * mail/rmail.el (rmail-mime-charset-pattern): Add "?:" before
+       "format".
+       (rmail-convert-to-babyl-format): Undo the change from 2006-04-19.
+
 2006-05-20  Martin Rudalics  <rudalics@gmx.at>
 
        * progmodes/hideif.el (show-ifdef-block): Fix bug where parts of

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index faeec5a..195eb60 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -624,7 +624,7 @@ the variable `rmail-mime-feature'.")
 ;;;###autoload
 (defvar rmail-mime-charset-pattern
   (concat "^content-type:[ ]*text/plain;"
-         "\\(?:[ \t\n]*\\(format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
+         "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
          "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?")
   "Regexp to match MIME-charset specification in a header of message.
 The first parenthesized expression should match the MIME-charset name.")
@@ -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 2))))))
+                                 (intern (downcase (match-string 1))))))
                         (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 2))))))
+                             (intern (downcase (match-string 1))))))
                     (rmail-decode-region start (point) mime-charset)))
               (save-excursion
                 (goto-char start)