Synch to No Gnus 200409260026.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a20a2c2..f0d947e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -76,6 +76,10 @@
        * mm-util.el (mm-charset-synonym-alist): Map "unicode" to
        "utf-16-le".
 
+2004-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * mm-decode.el (mm-copy-to-buffer): Preserve the data's unibyteness.
+
 2004-09-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * uudecode.el (uudecode-use-external): Add :version.
@@ -90,7 +94,7 @@
        * pgg-def.el (pgg-query-keyserver): Add :version.
 
        * nnmail.el (nnmail-fancy-expiry-targets)
-       (nnmail-mail-splitting-charset, nnmail-mail-splitting-decodes): 
+       (nnmail-mail-splitting-charset, nnmail-mail-splitting-decodes):
 
        * nnimap.el (nnimap-split-download-body, nnimap-dont-close)
        (nnimap-retrieve-groups-asynchronous): Add :version.
@@ -99,7 +103,7 @@
        * mml.el (mml-content-disposition-parameters)
        (mml-insert-mime-headers-always): Add :version.
 
-       * mm-util.el (mm-coding-system-priorities): 
+       * mm-util.el (mm-coding-system-priorities):
 
        * mm-decode.el (mm-inline-text-html-with-images)
        (mm-keep-viewer-alive-types, mm-external-terminal-program)
@@ -127,7 +131,7 @@
        (message-insert-canlock, message-wide-reply-confirm-recipients):
        Change :version.
 
-       * mail-source.el (mail-source-ignore-errors): Added :group, :type
+       * mail-source.el (mail-source-ignore-errors): Add :group, :type
        and :version.
        (mail-source-delete-old-incoming-confirm)
        (mail-source-movemail-program): Add :version.
@@ -156,7 +160,7 @@
        * gnus-srvr.el (gnus-server-browse-in-group-buffer)
        (gnus-server-offline-face): Add :version.
 
-       * gnus-score.el (gnus-adaptive-word-length-limit): 
+       * gnus-score.el (gnus-adaptive-word-length-limit):
 
        * gnus-msg.el (gnus-gcc-externalize-attachments)
        (gnus-debug-files, gnus-debug-exclude-variables)
@@ -224,7 +228,7 @@
 
 2004-09-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * gnus-sum.el (gnus-fetch-old-headers): Added custom choices `t'
+       * gnus-sum.el (gnus-fetch-old-headers): Add custom choices `t'
        and `invisible'.
 
 2004-09-10  Teodor Zlatanov  <tzz@lifelogs.com>
@@ -249,7 +253,7 @@
 
 2004-09-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * gnus-sum.el (gnus-summary-copy-article): Fixed doc string.
+       * gnus-sum.el (gnus-summary-copy-article): Fix doc string.
 
 2004-09-11  Simon Josefsson  <jas@extundo.com>
 
@@ -273,10 +277,9 @@
 2004-09-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nntp.el (nntp): New customization group.
-       (nntp-authinfo-file): Added customization group.
+       (nntp-authinfo-file): Add customization group.
 
-       * mml2015.el (mml2015-unabbrev-trust-alist): Added customization
-       group.
+       * mml2015.el (mml2015-unabbrev-trust-alist): Add customization group.
 
        * mml-sec.el (mml-signencrypt-style-alist): Ditto.
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 6e9ee2d..020a065 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -620,18 +620,17 @@ Postpone undisplaying of viewers for types in
 (defun mm-copy-to-buffer ()
   "Copy the contents of the current buffer to a fresh buffer."
   (save-excursion
-    (let ((flag enable-multibyte-characters)
-         (new-buffer (generate-new-buffer " *mm*")))
+    (let ((obuf (current-buffer))
+         (multibyte enable-multibyte-characters)
+         beg)
       (goto-char (point-min))
       (search-forward-regexp "^\n" nil t)
-      (save-restriction
-       (narrow-to-region (point) (point-max))
-       (when flag
-         (set-buffer-multibyte nil))
-       (copy-to-buffer new-buffer (point-min) (point-max))
-       (when flag
-         (set-buffer-multibyte t)))
-      new-buffer)))
+      (setq beg (point))
+      (set-buffer (generate-new-buffer " *mm*"))
+      ;; Preserve the data's unibyteness (for url-insert-file-contents).
+      (set-buffer-multibyte multibyte)
+      (insert-buffer-substring obuf beg)
+      (current-buffer))))
 
 (defun mm-display-parts (handle &optional no-default)
   (if (stringp (car handle))