mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 793bb4e17e99630b6d5a86603bb72145b45169b9..f6d3555975e582d7f5b18b8e72613e0a18eeab2e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-14  Kenichi Handa  <handa@m17n.org>
 
+       * mail/rmail.el (rmail-show-message-1): Catch an error of
+       base64-decode-region and just show an error message (bug#7165).
+
        * ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used
        anymore.
        (ps-mule-begin-job): Fix for the case that only ENCODING is set in

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index fa0b7bef20799a71b84afba5f73eabbb5c4d9e87..3ab87fa21f77dc1753a1f5ff3fceb5202741a1c6 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2742,7 +2742,9 @@ The current mail message becomes the message displayed."
                                                 nil t 'unibyte)
                  (message "Malformed MIME quoted-printable message")))
             ((and (string= character-coding "base64") is-text-message)
-             (base64-decode-region (point-min) (point-max)))
+             (condition-case err
+                 (base64-decode-region (point-min) (point-max))
+               (error (message "%s" (cdr err)))))
             ((eq character-coding 'uuencode)
              (error "uuencoded messages are not supported yet"))
             (t))