aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2011-05-20 00:03:51 +0000
committerKatsumi Yamaoka2011-05-20 00:03:51 +0000
commitcfe397c6d2123c82a12bbed1f26a45d0ddfc781f (patch)
tree517891d56a9d2195153e90441f073dab13b77094
parent9ff90d99bf2848e37b559e8fea77df05ffd2eba3 (diff)
downloademacs-cfe397c6d2123c82a12bbed1f26a45d0ddfc781f.tar.gz
emacs-cfe397c6d2123c82a12bbed1f26a45d0ddfc781f.zip
mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading whitespace in base64 data lines.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mm-bodies.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 66f30f03eff..2b51637e3d1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-05-19 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading
4 whitespace in base64 data lines.
5
12011-05-18 Teodor Zlatanov <tzz@lifelogs.com> 62011-05-18 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * gnus-registry.el (gnus-registry-user-format-function-M): 8 * gnus-registry.el (gnus-registry-user-format-function-M):
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 9952f410f0d..695451ddc45 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -197,7 +197,8 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
197 (while (re-search-forward "^[\t ]*\r?\n" nil t) 197 (while (re-search-forward "^[\t ]*\r?\n" nil t)
198 (delete-region (match-beginning 0) (match-end 0))) 198 (delete-region (match-beginning 0) (match-end 0)))
199 (goto-char (point-max)) 199 (goto-char (point-max))
200 (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t) 200 (when (re-search-backward "^[\t ]*[A-Za-z0-9+/]+=*[\t ]*$"
201 nil t)
201 (forward-line)) 202 (forward-line))
202 (point)))) 203 (point))))
203 ((memq encoding '(nil 7bit 8bit binary)) 204 ((memq encoding '(nil 7bit 8bit binary))