From: Katsumi Yamaoka Date: Wed, 12 May 2010 08:24:25 +0000 (+0000) Subject: Synch with Gnus trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2^2~30 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=706deb23dce31d2af3e672c3f30d0a578c023c12;p=emacs.git 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 194d2036c3f..d9fbef23cc1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2010-05-12 Katsumi Yamaoka + + * 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 * message.el (message-forward-make-body-mml): Assume original message 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)