Synch with Gnus trunk.

(message-forward-make-body-plain, message-forward-make-body-mml):
 Use mm-multibyte-string-p instead of multibyte-string-p.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 194d2036c3f..d9fbef23cc1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
 2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * message.el (message-forward-make-body-plain)
+        (message-forward-make-body-mml): Use mm-multibyte-string-p instead of
+        multibyte-string-p.
+
+2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
         * message.el (message-forward-make-body-mml): Assume original message
         is multibyte string; error on unibyte.
         (message-forward-make-body-plain): Ditto; don't add excessive newline
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 897fe695288..947b1bd53e8 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7165,7 +7165,7 @@ Optional DIGEST will use digest to forward."
         (contents (with-current-buffer forward-buffer (buffer-string)))
         e)
     (unless (featurep 'xemacs)
-      (unless (multibyte-string-p contents)
+      (unless (mm-multibyte-string-p contents)
         (error "Attempt to insert unibyte string from the buffer \"%s\"\
  to the multibyte buffer \"%s\""
                (if (bufferp forward-buffer)
@@ -7220,7 +7220,7 @@ Optional DIGEST will use digest to forward."
     (if (not message-forward-decoded-p)
         (let ((contents (with-current-buffer forward-buffer (buffer-string))))
           (unless (featurep 'xemacs)
-            (unless (multibyte-string-p contents)
+            (unless (mm-multibyte-string-p contents)
               (error "Attempt to insert unibyte string from the buffer \"%s\"\
  to the multibyte buffer \"%s\""
                      (if (bufferp forward-buffer)