* mail/rmail.el (rmail-show-message-1): Handle malformed

quoted-printable text.  (Bug#5441)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbd40d088e8284535723b8989b0f6229003b40a7..f81a3d169130e3be3fbf3b6056408b129aaa20c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-02-04  Glenn Morris  <rgm@gnu.org>
 
+       * mail/rmail.el (rmail-show-message-1): Handle malformed
+       quoted-printable text.  (Bug#5441)
+
        * mail/mail-utils.el (mail-unquote-printable-region): Doc fix.
 
        * simple.el (visual-line-mode): Capitalize lighter.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1dbfceb315b11eb30077acd9836a611ae5237407..a737b99c29ece5745d77acbf199ba14f09363a6b 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2727,8 +2727,10 @@ The current mail message becomes the message displayed."
            (insert-buffer-substring mbox-buf body-start end)
            (cond
             ((string= character-coding "quoted-printable")
-             (mail-unquote-printable-region (point-min) (point-max)
-                                             nil nil 'unibyte))
+             ;; See bug#5441.
+             (or (mail-unquote-printable-region (point-min) (point-max)
+                                                nil t 'unibyte)
+                 (message "Malformed MIME quoted-printable message")))
             ((and (string= character-coding "base64") is-text-message)
              (base64-decode-region (point-min) (point-max)))
             ((eq character-coding 'uuencode)