Synch with Gnus trunk.

(mm-extern-url): Don't use mm-with-unibyte-current-buffer.
(mm-extern-cache-contents): Use with-current-buffer instead of
 save-excursion + set-buffer.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4460e9b6d0b..71dc9727b4a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-extern.el (mm-extern-url): Don't use
+        mm-with-unibyte-current-buffer.
+        (mm-extern-cache-contents): Use with-current-buffer instead of
+        save-excursion + set-buffer.
+
 2010-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-util.el (mm-emacs-mule): Remove.
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index 1e3df3c4cff..f40f798789c 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -67,9 +67,8 @@
         (coding-system-for-read mm-binary-coding-system))
     (unless url
       (error "URL is not specified"))
-    (mm-with-unibyte-current-buffer
-      (mm-url-insert-file-contents url))
     (mm-disable-multibyte)
+    (mm-url-insert-file-contents url)
     (setq buffer-file-name name)))
 
 (defun mm-extern-anon-ftp (handle)
@@ -125,7 +124,7 @@
                             (or access-type
                                 (error "Couldn't find access type"))))
                           mm-extern-function-alist)))
-         buf handles)
+         handles)
     (unless func
       (error "Access type (%s) is not supported" access-type))
     (mm-with-part handle
@@ -136,8 +135,7 @@
     (unless (bufferp (car handles))
       (mm-destroy-parts handles)
       (error "Multipart external body is not supported"))
-    (save-excursion
-      (set-buffer (setq buf (mm-handle-buffer handles)))
+    (with-current-buffer (mm-handle-buffer handles)
       (let (good)
         (unwind-protect
             (progn