Changeset 4210 for trunk/lisp/mail/rmail.el

Timestamp:

06/02/07 09:29:41 (1 year ago)

Author:

miyoshi

Message:

Sync up with Emacs_22_BASE.

Files:

• trunk/lisp/mail/rmail.el (modified) (2 diffs)

trunk/lisp/mail/rmail.el

@@ -1960 +1960 @@
-                         (save-excursion
-                           (goto-char start)
+                           ;; Don't try to decode non-text data.
-                           (and (re-search-forward
+                                 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+                                 header-end t)
+                                (goto-char start)
+                                (re-search-forward
-                                 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
-                                 header-end t)
-                                ;; Don't try to decode non-text data.
-                                (re-search-forward
-                                 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
-                                 header-end t)))))
-                   (if quoted-printable-header-field-end
@@ -2067 +2068 @@
-                      (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