[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100155: Synch with Gnus trunk.
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100155: Synch with Gnus trunk. |
Date: |
Thu, 06 May 2010 03:28:13 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100155 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-06 03:28:13 +0000
message:
Synch with Gnus trunk.
(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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/mml.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-05-03 22:38:50 +0000
+++ b/lisp/gnus/ChangeLog 2010-05-06 03:27:20 +0000
@@ -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 <address@hidden>
+
+ * 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 <address@hidden>
* gnus-util.el: Don't load tm and apel XEmacs packages when compiling.
=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el 2010-05-03 00:41:45 +0000
+++ b/lisp/gnus/mml.el 2010-05-06 03:27:20 +0000
@@ -520,7 +520,10 @@
;; `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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100155: Synch with Gnus trunk.,
Katsumi Yamaoka <=