# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1148146567 0
# Node ID 4ec3b5b35f6db0e3cb8ceac4ef9c81bdd4680848
# Parent  6fe80a48b58a91b5def07ee7adeb41c942405aac
(rmail-mime-charset-pattern): Add "?:" before "format".
(rmail-convert-to-babyl-format): Undo the change from 2006-04-19.

diff -r 6fe80a48b58a -r 4ec3b5b35f6d lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Sat May 20 17:27:07 2006 +0000
+++ b/lisp/mail/rmail.el	Sat May 20 17:36:07 2006 +0000
@@ -624,7 +624,7 @@
 ;;;###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 @@
 					   (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 @@
 				       (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)