diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-10-14 13:23:36 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-10-14 13:23:36 +0900 |
| commit | 9650fc61909f4b0b142770b269d1905a41aa672d (patch) | |
| tree | 9ba68580278e1b8b3914ae307983e0923c59c63b | |
| parent | 4505bd02ef18fc8b0c8977a144fbbb28b3701e33 (diff) | |
| download | emacs-9650fc61909f4b0b142770b269d1905a41aa672d.tar.gz | |
mail/rmail.el (rmail-show-message-1): Catch an error of base64-decode-region and just show an error message (bug#7165).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 793bb4e17e9..f6d3555975e 100644 --- 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 fa0b7bef207..3ab87fa21f7 100644 --- 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)) |