comparison lisp/mail/rmail.el @ 53445:c6a08cba798f

(rmail-convert-to-babyl-format): Make the code cleaner (suggested by Richard Stallman).
author Eli Zaretskii <eliz@is.elta.co.il>
date Tue, 30 Dec 2003 10:45:41 +0000
parents f2e9f66ff625
children 5100c8a09d67
comparison
equal deleted inserted replaced
53444:673b9dafcf0f 53445:c6a08cba798f
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 (condition-case nil 1690 (save-excursion
1691 (save-excursion 1691 (when
1692 (base64-decode-region (1+ header-end) 1692 (condition-case nil
1693 (- (point) 2)) 1693 (progn
1694 ;; Change "base64" to "8bit", to reflect the 1694 (base64-decode-region (1+ header-end)
1695 ;; decoding we just did. 1695 (- (point) 2))
1696 (goto-char (1+ header-end)) 1696 t)
1697 (while (search-forward "\r\n" (point-max) t) 1697 (error nil))
1698 (replace-match "\n")) 1698 ;; Change "base64" to "8bit", to reflect the
1699 (goto-char base64-header-field-end) 1699 ;; decoding we just did.
1700 (delete-region (point) (search-backward ":")) 1700 (goto-char (1+ header-end))
1701 (insert ": 8bit")) 1701 (while (search-forward "\r\n" (point-max) t)
1702 (error nil))) 1702 (replace-match "\n"))
1703 (goto-char base64-header-field-end)
1704 (delete-region (point) (search-backward ":"))
1705 (insert ": 8bit"))))
1703 (setq last-coding-system-used nil) 1706 (setq last-coding-system-used nil)
1704 (or rmail-enable-mime 1707 (or rmail-enable-mime
1705 (not rmail-enable-multibyte) 1708 (not rmail-enable-multibyte)
1706 (let ((mime-charset 1709 (let ((mime-charset
1707 (if (and rmail-decode-mime-charset 1710 (if (and rmail-decode-mime-charset
1827 ;; to reflect the decoding we just did. 1830 ;; to reflect the decoding we just did.
1828 (goto-char quoted-printable-header-field-end) 1831 (goto-char quoted-printable-header-field-end)
1829 (delete-region (point) (search-backward ":")) 1832 (delete-region (point) (search-backward ":"))
1830 (insert ": 8bit"))) 1833 (insert ": 8bit")))
1831 (if base64-header-field-end 1834 (if base64-header-field-end
1832 (condition-case nil 1835 (save-excursion
1833 (save-excursion 1836 (when
1834 (base64-decode-region header-end (point)) 1837 (condition-case nil
1835 ;; Change "base64" to "8bit", to reflect the 1838 (progn
1836 ;; decoding we just did. 1839 (base64-decode-region header-end (point))
1837 (goto-char base64-header-field-end) 1840 t)
1838 (delete-region (point) (search-backward ":")) 1841 (error nil))
1839 (insert ": 8bit")) 1842 ;; Change "base64" to "8bit", to reflect the
1840 (error nil)))) 1843 ;; decoding we just did.
1844 (goto-char base64-header-field-end)
1845 (delete-region (point) (search-backward ":"))
1846 (insert ": 8bit")))))
1841 1847
1842 (save-excursion 1848 (save-excursion
1843 (save-restriction 1849 (save-restriction
1844 (narrow-to-region start (point)) 1850 (narrow-to-region start (point))
1845 (goto-char (point-min)) 1851 (goto-char (point-min))