diff lisp/mail/rmail.el @ 90843:d7172f202ab8

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 726-750) - Update from CVS - Merge from emacs--rel--22 - Merge from gnus--rel--5.10 * emacs--rel--22 (patch 6-17) - Update from CVS - Update from CVS: src/xterm.c (XTread_socket): Revert last change. * gnus--rel--5.10 (patch 218-221) - Merge from emacs--devo--0, emacs--rel--22 - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-205

--- a/lisp/mail/rmail.el	Mon May 14 11:56:47 2007 +0000
+++ b/lisp/mail/rmail.el	Tue May 15 07:17:13 2007 +0000
@@ -1959,12 +1959,13 @@
 			(base64-header-field-end
 			 (save-excursion
 			   (goto-char start)
+			   ;; Don't try to decode non-text data.
 			   (and (re-search-forward
-				 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
+				 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
 				 header-end t)
-				;; Don't try to decode non-text data.
+				(goto-char start)
 				(re-search-forward
-				 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+				 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
 				 header-end t)))))
 		   (if quoted-printable-header-field-end
 		       (save-excursion
@@ -2066,14 +2067,14 @@
 			  header-end t)))
 		      (base64-header-field-end
 		       (and
-			(save-excursion
-			  (re-search-forward
-			   "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
-			   header-end t))
 			;; Don't decode non-text data.
 			(save-excursion
 			  (re-search-forward
 			   "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+			   header-end t))
+			(save-excursion
+			  (re-search-forward
+			   "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
 			   header-end t))))
 		      (size
 		       ;; Get the numeric value from the Content-Length field.