Synch with Gnus trunk.

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 194d2036c3f375b8a477fc90677749aafd62b943..d9fbef23cc1bf97948e348f0bf59f9a88708dad3 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 897fe6952884a9aefa39a92db7c36bb6a781faf0..947b1bd53e873385a0be8b76d9f46bd67d614a24 100644 (file)
--- 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)