mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity

Synch with Gnus trunk.

Browse Source 
(mml-generate-mime-1,mml-compute-boundary-1): Update 'mml
handles on recursive mml-to-mime translation and check them for
boundary delimiter collisions.  Reported by: Greg Troxel.
This commit is contained in:
Katsumi Yamaoka 2010-05-06 03:27:20 +00:00
parent 1493963bb1
commit ee3097571b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/gnus/ChangeLog
View File

@ -21,6 +21,12 @@
* gnus-dired.el (gnus-dired-mode-map): Initialize in declaration.
(gnus-dired-mode): Use define-minor-mode.
2010-05-01 Andreas Seltenreich <seltenreich@gmx.de>
* mml.el (mml-generate-mime-1,mml-compute-boundary-1): Update 'mml
handles on recursive mml-to-mime translation and check them for
boundary delimiter collisions. Reported by: Greg Troxel.
2010-04-27 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-util.el: Don't load tm and apel XEmacs packages when compiling.

7
lisp/gnus/mml.el
View File

@ -520,7 +520,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
;; `m-g-d-t' will be bound to "message/rfc822"
;; when encoding an article to be forwarded.
(mml-generate-default-type "text/plain"))
(mml-to-mime))
(mml-to-mime)
;; Update handle so mml-compute-boundary can
;; detect collisions with the nested parts.
(setcdr (assoc 'contents cont) (buffer-string)))
(let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
;; ignore 0x1b, it is part of iso-2022-jp
(setq encoding (mm-body-7-or-8))))
@ -699,7 +702,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(defun mml-compute-boundary-1 (cont)
(let (filename)
(cond
((eq (car cont) 'part)
((member (car cont) '(part mml))
(with-temp-buffer
(cond
((cdr (assq 'buffer cont))