Synch to No Gnus 200409270413.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c6e014..d73e732 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-copy-to-buffer): Don't use set-buffer-multibyte.
+
 2004-09-26  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-dup.el (gnus-dup-open): Use mapc.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 020a065..a06bd4b 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -621,14 +621,14 @@ Postpone undisplaying of viewers for types in
   "Copy the contents of the current buffer to a fresh buffer."
   (save-excursion
     (let ((obuf (current-buffer))
-         (multibyte enable-multibyte-characters)
          beg)
       (goto-char (point-min))
       (search-forward-regexp "^\n" nil t)
       (setq beg (point))
-      (set-buffer (generate-new-buffer " *mm*"))
-      ;; Preserve the data's unibyteness (for url-insert-file-contents).
-      (set-buffer-multibyte multibyte)
+      (set-buffer
+       ;; Preserve the data's unibyteness (for url-insert-file-contents).
+       (let ((default-enable-multibyte-characters (mm-multibyte-p)))
+        (generate-new-buffer " *mm*")))
       (insert-buffer-substring obuf beg)
       (current-buffer))))