[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el, v [EMACS_22_BASE]

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Eli Zaretskii <eliz>    07/05/14 19:48:30

Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.433
retrieving revision 1.433.2.1
diff -u -b -r1.433 -r1.433.2.1
--- rmail.el    3 Apr 2007 11:11:27 -0000       1.433
+++ rmail.el    14 May 2007 19:48:30 -0000      1.433.2.1
@@ -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
+                       ;; Don't decode non-text data.
                        (save-excursion
                          (re-search-forward
-                          "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
+                          "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
                           header-end t))
-                       ;; Don't decode non-text data.
                        (save-excursion
                          (re-search-forward
-                          "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+                          "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
                           header-end t))))
                      (size
                       ;; Get the numeric value from the Content-Length field.