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>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9cef3e87de2c405b2e55010ff051ceb51ce879d3..1bdb9103b46190b083383108e7b4714e7e681aec 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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).

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 87aff3e125c8e42b213a25869f020a2771c70cf5..0bfe652c0c1f37f5a98ec49d8905dea6c7ed82d8 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -305,6 +305,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
        (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 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                (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 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
             (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