comparison lisp/mail/rmail.el @ 52988:f2e9f66ff625

(rmail-convert-to-babyl-format): If base64-decode-region signals an error, catch it and silently ignore it.
author Eli Zaretskii <eliz@gnu.org>
date Mon, 03 Nov 2003 19:20:23 +0000
parents 36bc6bf83146
children c6a08cba798f
comparison
equal deleted inserted replaced
52987:ac21698ba968 52988:f2e9f66ff625
1685 ;; to reflect the decoding we just did. 1685 ;; to reflect the decoding we just did.
1686 (goto-char quoted-printable-header-field-end) 1686 (goto-char quoted-printable-header-field-end)
1687 (delete-region (point) (search-backward ":")) 1687 (delete-region (point) (search-backward ":"))
1688 (insert ": 8bit"))) 1688 (insert ": 8bit")))
1689 (if base64-header-field-end 1689 (if base64-header-field-end
1690 (save-excursion 1690 (condition-case nil
1691 (base64-decode-region (1+ header-end) 1691 (save-excursion
1692 (- (point) 2)) 1692 (base64-decode-region (1+ header-end)
1693 ;; Change "base64" to "8bit", to reflect the 1693 (- (point) 2))
1694 ;; decoding we just did. 1694 ;; Change "base64" to "8bit", to reflect the
1695 (goto-char (1+ header-end)) 1695 ;; decoding we just did.
1696 (while (search-forward "\r\n" (point-max) t) 1696 (goto-char (1+ header-end))
1697 (replace-match "\n")) 1697 (while (search-forward "\r\n" (point-max) t)
1698 (goto-char base64-header-field-end) 1698 (replace-match "\n"))
1699 (delete-region (point) (search-backward ":")) 1699 (goto-char base64-header-field-end)
1700 (insert ": 8bit"))) 1700 (delete-region (point) (search-backward ":"))
1701 (insert ": 8bit"))
1702 (error nil)))
1701 (setq last-coding-system-used nil) 1703 (setq last-coding-system-used nil)
1702 (or rmail-enable-mime 1704 (or rmail-enable-mime
1703 (not rmail-enable-multibyte) 1705 (not rmail-enable-multibyte)
1704 (let ((mime-charset 1706 (let ((mime-charset
1705 (if (and rmail-decode-mime-charset 1707 (if (and rmail-decode-mime-charset
1825 ;; to reflect the decoding we just did. 1827 ;; to reflect the decoding we just did.
1826 (goto-char quoted-printable-header-field-end) 1828 (goto-char quoted-printable-header-field-end)
1827 (delete-region (point) (search-backward ":")) 1829 (delete-region (point) (search-backward ":"))
1828 (insert ": 8bit"))) 1830 (insert ": 8bit")))
1829 (if base64-header-field-end 1831 (if base64-header-field-end
1830 (save-excursion 1832 (condition-case nil
1831 (base64-decode-region header-end (point)) 1833 (save-excursion
1832 ;; Change "base64" to "8bit", to reflect the 1834 (base64-decode-region header-end (point))
1833 ;; decoding we just did. 1835 ;; Change "base64" to "8bit", to reflect the
1834 (goto-char base64-header-field-end) 1836 ;; decoding we just did.
1835 (delete-region (point) (search-backward ":")) 1837 (goto-char base64-header-field-end)
1836 (insert ": 8bit")))) 1838 (delete-region (point) (search-backward ":"))
1839 (insert ": 8bit"))
1840 (error nil))))
1837 1841
1838 (save-excursion 1842 (save-excursion
1839 (save-restriction 1843 (save-restriction
1840 (narrow-to-region start (point)) 1844 (narrow-to-region start (point))
1841 (goto-char (point-min)) 1845 (goto-char (point-min))