diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 50 |
2 files changed, 31 insertions, 22 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f00f5bc963..074a9ed87ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2003-12-30 Eli Zaretskii <eliz@elta.co.il> + * mail/rmail.el (rmail-convert-to-babyl-format): Make the code + cleaner (suggested by Richard Stallman). + * progmodes/gud.el (gud-tool-bar-map): Modify names of icon files for gud-next, gud-nexti, gud-step and gud-stepi to prevent file-name clashes on 8+3 DOS filesystems. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index acc7e4839dd..512712ec4bc 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1687,19 +1687,22 @@ It returns t if it got any new messages." (delete-region (point) (search-backward ":")) (insert ": 8bit"))) (if base64-header-field-end - (condition-case nil - (save-excursion - (base64-decode-region (1+ header-end) - (- (point) 2)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char (1+ header-end)) - (while (search-forward "\r\n" (point-max) t) - (replace-match "\n")) - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit")) - (error nil))) + (save-excursion + (when + (condition-case nil + (progn + (base64-decode-region (1+ header-end) + (- (point) 2)) + t) + (error nil)) + ;; Change "base64" to "8bit", to reflect the + ;; decoding we just did. + (goto-char (1+ header-end)) + (while (search-forward "\r\n" (point-max) t) + (replace-match "\n")) + (goto-char base64-header-field-end) + (delete-region (point) (search-backward ":")) + (insert ": 8bit")))) (setq last-coding-system-used nil) (or rmail-enable-mime (not rmail-enable-multibyte) @@ -1829,15 +1832,18 @@ It returns t if it got any new messages." (delete-region (point) (search-backward ":")) (insert ": 8bit"))) (if base64-header-field-end - (condition-case nil - (save-excursion - (base64-decode-region header-end (point)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit")) - (error nil)))) + (save-excursion + (when + (condition-case nil + (progn + (base64-decode-region header-end (point)) + t) + (error nil)) + ;; Change "base64" to "8bit", to reflect the + ;; decoding we just did. + (goto-char base64-header-field-end) + (delete-region (point) (search-backward ":")) + (insert ": 8bit"))))) (save-excursion (save-restriction |