# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1287030278 -32400
# Node ID 00e4f2600720c379361119b949bce961c4bbaeb2
# Parent  b74f1db2d13fb8cbbb94ec6a49780b1e5034300e# Parent  12afc39096c21d7c6e416b4ab4f15f779a73bd49
mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and just show an error message (bug#7165).

diff -r b74f1db2d13f -r 00e4f2600720 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 14 11:07:23 2010 +0900
+++ b/lisp/ChangeLog	Thu Oct 14 13:24:38 2010 +0900
@@ -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 -r b74f1db2d13f -r 00e4f2600720 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Thu Oct 14 11:07:23 2010 +0900
+++ b/lisp/mail/rmail.el	Thu Oct 14 13:24:38 2010 +0900
@@ -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))