From: yamaoka <yamaoka>
Date: Thu, 2 Mar 2006 07:08:48 +0000 (+0000)
Subject: Synch to No Gnus 200603020708.
X-Git-Tag: t-gnus-6_17_4-quimby-~63
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fgnus.git-;a=commitdiff_plain;h=bbfde7186a0733cc0162c076dab5e1f0a39a1cf3

Synch to No Gnus 200603020708.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 112cfc9..20fc4ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml.el (mml-generate-mime-1): Encode parts other than text/* or
+	message/* containing non-ASCII text properly.
+
 2006-03-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* message.el: Require gmm-utils, remove autoloads.
diff --git a/lisp/mml.el b/lisp/mml.el
index 5f310e5..57ec619 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -518,7 +518,15 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 				 (mm-find-buffer-file-coding-system
 				  filename)))))
 	       (t
-		(insert (cdr (assq 'contents cont)))))
+		(let ((contents (cdr (assq 'contents cont))))
+		  (if (if (featurep 'xemacs)
+			  (string-match "[^\000-\377]" contents)
+			(mm-multibyte-string-p contents))
+		      (progn
+			(mm-enable-multibyte)
+			(insert contents)
+			(setq charset (mm-encode-body charset)))
+		    (insert contents)))))
 	      (setq encoding (mm-encode-buffer type)
 		    coded (mm-string-as-multibyte (buffer-string))))
 	    (mml-insert-mime-headers cont type charset encoding nil)