1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00

(rmail-convert-to-babyl-format): Check content-transfer-encoding _last_,

because it's its position that we need in base64-header-field-end.
This commit is contained in:
Eli Zaretskii 2007-05-14 19:49:26 +00:00
parent 2670654d2a
commit 3679904100
2 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2007-05-14 Eli Zaretskii <eliz@gnu.org>
* mail/rmail.el (rmail-convert-to-babyl-format): Check
content-transfer-encoding _last_, because we need its position in
base64-header-field-end.
2007-05-14 Juanma Barranquero <lekktu@gmail.com>
* files.el (mode-require-final-newline, require-final-newline)

View File

@ -1959,12 +1959,13 @@ is non-nil if the user has supplied the password interactively.
(base64-header-field-end
(save-excursion
(goto-char start)
;; Don't try to decode non-text data.
(and (re-search-forward
"^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
header-end t)
;; Don't try to decode non-text data.
(re-search-forward
"^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
header-end t)
(goto-char start)
(re-search-forward
"^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
header-end t)))))
(if quoted-printable-header-field-end
(save-excursion
@ -2066,14 +2067,14 @@ is non-nil if the user has supplied the password interactively.
header-end t)))
(base64-header-field-end
(and
(save-excursion
(re-search-forward
"^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
header-end t))
;; Don't decode non-text data.
(save-excursion
(re-search-forward
"^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
header-end t))
(save-excursion
(re-search-forward
"^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
header-end t))))
(size
;; Get the numeric value from the Content-Length field.