* mml.el (mml-generate-mime-1): Use mm-string-as-unibyte instead of

 mm-with-unibyte-current-buffer to make string unibyte.

* mm-decode.el (mm-insert-part): Use mm-string-to-multibyte instead of
 mm-string-as-multibyte.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7027e98..8dd5779 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mml.el (mml-generate-mime-1): Use mm-string-as-unibyte instead of
+       mm-with-unibyte-current-buffer to make string unibyte.
+
+       * mm-decode.el (mm-insert-part): Use mm-string-to-multibyte instead of
+       mm-string-as-multibyte.
+
 2006-11-14  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-sign): Prefix "pgp-" to a micalg value.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index b03bde2..ce3010f 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1133,7 +1133,7 @@ are ignored."
            (with-current-buffer (mm-handle-buffer handle)
              (buffer-string)))
           ((mm-multibyte-p)
-           (mm-string-as-multibyte (mm-get-part handle no-cache)))
+           (mm-string-to-multibyte (mm-get-part handle no-cache)))
           (t
            (mm-get-part handle no-cache))))))
 

diff --git a/lisp/mml.el b/lisp/mml.el
index c17f1f8..fc19974 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -505,9 +505,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 (with-current-buffer (cdr (assq 'buffer cont))
-                         (mm-with-unibyte-current-buffer
-                           (buffer-string)))))
+               (insert (mm-string-as-unibyte
+                        (with-current-buffer (cdr (assq 'buffer cont))
+                          (buffer-string)))))
               ((and filename
                     (not (equal (cdr (assq 'nofile cont)) "yes")))
                (let ((coding-system-for-read mm-binary-coding-system))