[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100212: Synch with Gnus trunk.
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100212: Synch with Gnus trunk. |
Date: |
Mon, 10 May 2010 03:40:12 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100212 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-10 03:40:12 +0000
message:
Synch with Gnus trunk.
(message-forward-make-body-plain, message-forward-make-body-mml):
Don't use mm-with-unibyte-current-buffer.
modified:
lisp/gnus/ChangeLog
lisp/gnus/message.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-05-08 18:47:07 +0000
+++ b/lisp/gnus/ChangeLog 2010-05-10 03:39:23 +0000
@@ -1,4 +1,10 @@
-2010-05-07 Christian von Roques <address@hidden> (tiny change)
+2010-05-10 Katsumi Yamaoka <address@hidden>
+
+ * 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 <address@hidden> (tiny change)
* mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
(Bug#5592).
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2010-05-08 18:47:07 +0000
+++ b/lisp/gnus/message.el 2010-05-10 03:39:23 +0000
@@ -7161,14 +7161,20 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100212: Synch with Gnus trunk.,
Katsumi Yamaoka <=