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

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    07/04/03 11:11:27

Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- rmail.el    24 Feb 2007 17:12:34 -0000      1.432
+++ rmail.el    3 Apr 2007 11:11:27 -0000       1.433
@@ -1959,9 +1959,13 @@
                        (base64-header-field-end
                         (save-excursion
                           (goto-char start)
-                          (re-search-forward
+                          (and (re-search-forward
                            "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
-                           header-end 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
                       (save-excursion
                         (unless
@@ -2061,10 +2065,16 @@
                          "^content-transfer-encoding:\\(\n?[\t 
]\\)*quoted-printable\\(\n?[\t ]\\)*"
                          header-end t)))
                      (base64-header-field-end
+                      (and
                       (save-excursion
                         (re-search-forward
                          "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
-                         header-end t)))
+                          header-end t))
+                       ;; Don't decode non-text data.
+                       (save-excursion
+                         (re-search-forward
+                          "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+                          header-end t))))
                      (size
                       ;; Get the numeric value from the Content-Length field.
                       (save-excursion