[Emacs-diffs] /srv/bzr/emacs/trunk r100243: Synch with Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100243 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2010-05-12 08:25:16 +0000
message:
  Synch with Gnus trunk.
  (message-forward-make-body-plain, message-forward-make-body-mml):
   Use mm-multibyte-string-p instead of multibyte-string-p.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-05-12 02:09:58 +0000
+++ b/lisp/gnus/ChangeLog       2010-05-12 08:24:25 +0000
@@ -1,5 +1,11 @@
 2010-05-12  Katsumi Yamaoka  <address@hidden>
 
+       * 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  <address@hidden>
+
        * message.el (message-forward-make-body-mml): Assume original message
        is multibyte string; error on unibyte.
        (message-forward-make-body-plain): Ditto; don't add excessive newline

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-05-12 02:09:58 +0000
+++ b/lisp/gnus/message.el      2010-05-12 08:24:25 +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)