From: yamaoka <yamaoka>
Date: Mon, 24 Jan 2005 12:36:34 +0000 (+0000)
Subject: Synch to No Gnus 200501241236.
X-Git-Tag: t-gnus-6_17_4-quimby-~583
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ed768179be7380c3a0cbe433beccfd164aa01b4d;p=elisp%2Fgnus.git-

Synch to No Gnus 200501241236.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e40f4b4..f1b212f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml.el (mml-generate-mime-1): Convert string into unibyte when
+	inserting " *mml*" buffer's contents into a unibyte temp buffer.
+
 2005-01-24  Harald Meland <harald.meland@usit.uio.no>  (tiny change)
 
 	* mail-source.el (mail-source-fetch-imap): Search for ^From case
diff --git a/lisp/mml.el b/lisp/mml.el
index 7e9d54d..968a650 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1,5 +1,5 @@
 ;;; mml.el --- A package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -468,7 +468,9 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	    (mm-with-unibyte-buffer
 	      (cond
 	       ((cdr (assq 'buffer cont))
-		(insert-buffer-substring (cdr (assq 'buffer cont))))
+		(insert (with-current-buffer (cdr (assq 'buffer cont))
+			  (mm-with-unibyte-current-buffer
+			    (buffer-string)))))
 	       ((and (setq filename (cdr (assq 'filename cont)))
 		     (not (equal (cdr (assq 'nofile cont)) "yes")))
 		(let ((coding-system-for-read mm-binary-coding-system))