Mercurial > emacs
changeset 110993:00e4f2600720
mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and just show an error message (bug#7165).
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 14 Oct 2010 13:24:38 +0900 |
| parents | b74f1db2d13f (current diff) 12afc39096c2 (diff) |
| children | 734b2470f93c |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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))