From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 12 May 2010 08:18:48 +0000 (+0000)
Subject: * message.el (message-forward-make-body-plain, message-forward-make-body-mml):
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=38a2fcd07b52d505d10c79ae739f16c86dba926e;p=gnus

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97ad6d9cb..bc9fc947b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +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.
+
+	* lpath.el: Revert.
+
 2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.el (message-forward-make-body-mml): Assume original message
diff --git a/lisp/message.el b/lisp/message.el
index 144229392..beb9d1642 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7138,7 +7138,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)
@@ -7193,7 +7193,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)