[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100112: mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and just show an error message (bug#7165).

[Kenichi Handa]

------------------------------------------------------------
revno: 100112 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-10-14 13:24:38 +0900
message:
  mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region 
and just show an error message (bug#7165).
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-14 02:06:31 +0000
+++ b/lisp/ChangeLog    2010-10-14 04:23:36 +0000
@@ -1,5 +1,8 @@
 2010-10-14  Kenichi Handa  <address@hidden>
 
+       * 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

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2010-08-20 07:11:35 +0000
+++ b/lisp/mail/rmail.el        2010-10-14 04:23:36 +0000
@@ -2742,7 +2742,9 @@
                                                 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))