mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(rmail-convert-to-babyl-format): If

Browse Source 
base64-decode-region signals an error, catch it and silently
ignore it.
This commit is contained in:
Eli Zaretskii 2003-11-03 19:21:02 +00:00
parent 552eb60792
commit a4db3cf56b
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-03 Eli Zaretskii <eliz@elta.co.il>
* mail/rmail.el (rmail-convert-to-babyl-format): If
base64-decode-region signals an error, catch it and silently
ignore it.
2003-11-01 Mark A. Hershberger <mah@everybody.org>
* xml.el: Allow comments following the top-level element.

40
lisp/mail/rmail.el
View File

@ -1687,17 +1687,19 @@ It returns t if it got any new messages."
(delete-region (point) (search-backward ":"))
(insert ": 8bit")))
(if base64-header-field-end
(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")))
(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)))
(setq last-coding-system-used nil)
(or rmail-enable-mime
(not rmail-enable-multibyte)
@ -1827,13 +1829,15 @@ It returns t if it got any new messages."
(delete-region (point) (search-backward ":"))
(insert ": 8bit")))
(if base64-header-field-end
(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"))))
(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
(save-restriction