Commit d8a7b272 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka
Browse files

Synch with Gnus trunk.

(message-forward-make-body-plain, message-forward-make-body-mml):
 Don't use mm-with-unibyte-current-buffer.
parent 1f8162fe
2010-05-07 Christian von Roques <roques@mti.ag> (tiny change)
2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org>
* message.el (message-forward-make-body-plain)
(message-forward-make-body-mml):
Don't use mm-with-unibyte-current-buffer.
2010-05-07 Christian von Roques <roques@mti.ag> (tiny change)
* mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
(Bug#5592).
......
......@@ -7161,14 +7161,20 @@ Optional DIGEST will use digest to forward."
(defun message-forward-make-body-plain (forward-buffer)
(insert
"\n-------------------- Start of forwarded message --------------------\n")
(let ((b (point)) e)
(let ((b (point))
contents multibyte-p e)
(with-current-buffer forward-buffer
(setq contents (buffer-string)
multibyte-p (mm-multibyte-p)))
(insert
(with-temp-buffer
(mm-disable-multibyte)
(insert
(with-current-buffer forward-buffer
(mm-with-unibyte-current-buffer (buffer-string))))
(mm-enable-multibyte)
(if multibyte-p
(progn
(mm-enable-multibyte)
(insert contents))
(mm-disable-multibyte)
(insert contents)
(mm-enable-multibyte))
(mime-to-mml)
(goto-char (point-min))
(when (looking-at "From ")
......@@ -7212,18 +7218,24 @@ Optional DIGEST will use digest to forward."
(insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
(let ((b (point)) e)
(if (not message-forward-decoded-p)
(insert
(with-temp-buffer
(mm-disable-multibyte)
(insert
(with-current-buffer forward-buffer
(mm-with-unibyte-current-buffer (buffer-string))))
(mm-enable-multibyte)
(mime-to-mml)
(goto-char (point-min))
(when (looking-at "From ")
(replace-match "X-From-Line: "))
(buffer-string)))
(let (contents multibyte-p)
(with-current-buffer forward-buffer
(setq contents (buffer-string)
multibyte-p (mm-multibyte-p)))
(insert
(with-temp-buffer
(if multibyte-p
(progn
(mm-enable-multibyte)
(insert contents))
(mm-disable-multibyte)
(insert contents)
(mm-enable-multibyte))
(mime-to-mml)
(goto-char (point-min))
(when (looking-at "From ")
(replace-match "X-From-Line: "))
(buffer-string))))
(save-restriction
(narrow-to-region (point) (point))
(mml-insert-buffer forward-buffer)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment