# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273652716 0
# Node ID f68570724a418e744b690129fc513101871321ab
# Parent  f8e62c2bf3e94bcb105ca52133900d3fdba4e2c1# Parent  4e5c3f6510c751500ac79115c8a7c134a756d397
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 -r f8e62c2bf3e9 -r f68570724a41 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue May 11 23:53:03 2010 -0700
+++ b/lisp/gnus/ChangeLog	Wed May 12 08:25:16 2010 +0000
@@ -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 -r f8e62c2bf3e9 -r f68570724a41 lisp/gnus/message.el
--- a/lisp/gnus/message.el	Tue May 11 23:53:03 2010 -0700
+++ b/lisp/gnus/message.el	Wed May 12 08:25:16 2010 +0000
@@ -7165,7 +7165,7 @@
 	(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 @@
     (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)