From: Miles Bader <miles@gnu.org>
Date: Mon, 27 Aug 2007 04:01:49 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-22.1.90~897
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b8801ec33b0d0c0bb0a98a1b2f533a0c0c00f3f;p=emacs.git

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

2007-08-23  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mml.el (mml-generate-mime): Make sure it uses multibyte temp buffer.
   (mml-generate-mime-1): Don't encode body if it is specified to be in
   raw form; don't make buffer be unibyte when inserting multibyte string.

2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)

   * man/message.texi (MIME): Replace mml-attach with mml-attach-file.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-100
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3e234161c3e..0cf879fd264 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml.el (mml-generate-mime): Make sure it uses multibyte temp buffer.
+	(mml-generate-mime-1): Don't encode body if it is specified to be in
+	raw form; don't make buffer be unibyte when inserting multibyte string.
+
 2007-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* sha1.el: Fix up comment style.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index dae746fa082..0c60bed409f 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -404,7 +404,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	(mml-multipart-number mml-multipart-number))
     (if (not cont)
 	nil
-      (with-temp-buffer
+      (mm-with-multibyte-buffer
 	(if (and (consp (car cont))
 		 (= (length cont) 1))
 	    (mml-generate-mime-1 (car cont))
@@ -516,14 +516,13 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 		      (progn
 			(mm-enable-multibyte)
 			(insert contents)
-			(setq charset (mm-encode-body)))
+			(unless raw
+			  (setq charset (mm-encode-body))))
 		    (insert contents)))))
 	      (setq encoding (mm-encode-buffer type)
 		    coded (mm-string-as-multibyte (buffer-string))))
 	    (mml-insert-mime-headers cont type charset encoding nil)
-	    (insert "\n")
-	    (mm-with-unibyte-current-buffer
-	      (insert coded)))))
+	    (insert "\n" coded))))
        ((eq (car cont) 'external)
 	(insert "Content-Type: message/external-body")
 	(let ((parameters (mml-parameter-string
diff --git a/man/ChangeLog b/man/ChangeLog
index a9719d6d454..04ccb80f6e0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)
+
+	* message.texi (MIME): Replace mml-attach with mml-attach-file.
+
 2007-08-27  Richard Stallman  <rms@gnu.org>
 
 	* emacs.texi (Top): Clarify menu item for Glossary.
diff --git a/man/message.texi b/man/message.texi
index eef4d77205a..2bca4b046e5 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -821,11 +821,11 @@ doesn't have to do anything to make the @acronym{MIME} happen---Message will
 automatically add the @code{Content-Type} and
 @code{Content-Transfer-Encoding} headers.
 
-@findex mml-attach
+@findex mml-attach-file
 @kindex C-c C-a
 The most typical thing users want to use the multipart things in
 @acronym{MIME} for is to add ``attachments'' to mail they send out.
-This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach}),
+This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach-file}),
 which will prompt for a file name and a @acronym{MIME} type.
 
 @vindex mml-dnd-protocol-alist