changeset 40757:bc2025610176

2001-11-05 ShengHuo ZHU <zsh@cs.rochester.edu> * mml.el (mml-generate-mime-1): Use mm-with-unibyte-current-buffer. Suggested by Dave Love <fx@gnu.org>.
author ShengHuo ZHU <zsh@cs.rochester.edu>
date Tue, 06 Nov 2001 04:28:29 +0000
parents 4c885d1ac450
children 00382536d185
files lisp/gnus/ChangeLog lisp/gnus/mml.el
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Tue Nov 06 02:00:31 2001 +0000
+++ b/lisp/gnus/ChangeLog	Tue Nov 06 04:28:29 2001 +0000
@@ -1,3 +1,8 @@
+2001-11-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mml.el (mml-generate-mime-1): Use mm-with-unibyte-current-buffer.
+	Suggested by  Dave Love  <fx@gnu.org>.
+	
 2001-11-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* mm-util.el (mm-charset-synonym-alist): Revert (some).
--- a/lisp/gnus/mml.el	Tue Nov 06 02:00:31 2001 +0000
+++ b/lisp/gnus/mml.el	Tue Nov 06 04:28:29 2001 +0000
@@ -305,6 +305,7 @@
 	(setq type (or (cdr (assq 'type cont)) "text/plain"))
 	(if (and (not raw)
 		 (member (car (split-string type "/")) '("text" "message")))
+	    (progn
 	    (with-temp-buffer
 	      (cond
 	       ((cdr (assq 'buffer cont))
@@ -342,6 +343,9 @@
 		(setq encoding (mm-body-encoding
 				charset (cdr (assq 'encoding cont))))))
 	      (setq coded (buffer-string)))
+	    (mml-insert-mime-headers cont type charset encoding)
+	    (insert "\n")
+	    (insert coded))
 	  (mm-with-unibyte-buffer
 	    (cond
 	     ((cdr (assq 'buffer cont))
@@ -353,10 +357,11 @@
 	     (t
 	      (insert (cdr (assq 'contents cont)))))
 	    (setq encoding (mm-encode-buffer type)
-		  coded (buffer-string))))
-	(mml-insert-mime-headers cont type charset encoding)
-	(insert "\n")
-	(insert coded)))
+		  coded (buffer-string)))
+	  (mml-insert-mime-headers cont type charset encoding)
+	  (insert "\n")
+	  (mm-with-unibyte-current-buffer
+	    (insert coded)))))
      ((eq (car cont) 'external)
       (insert "Content-Type: message/external-body")
       (let ((parameters (mml-parameter-string