Mercurial > emacs
changeset 108514:f68570724a41
Synch with Gnus trunk.
(message-forward-make-body-plain, message-forward-make-body-mml):
Use mm-multibyte-string-p instead of multibyte-string-p.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 12 May 2010 08:25:16 +0000 |
| parents | f8e62c2bf3e9 (current diff) 4e5c3f6510c7 (diff) |
| children | 75f27a9b3b3a |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)