# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273553084 0
# Node ID 21f80ea9c6a63865d7b6f9134e1382fa786b59b2
# Parent  cea42c2d79829fd5b84b583a69acc38ba1bd5a75# Parent  d72eb924677c60ef9050ae404962d3d4a2973307
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.

diff -r cea42c2d7982 -r 21f80ea9c6a6 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon May 10 20:18:58 2010 -0700
+++ b/lisp/gnus/ChangeLog	Tue May 11 04:44:44 2010 +0000
@@ -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 -r cea42c2d7982 -r 21f80ea9c6a6 lisp/gnus/mm-extern.el
--- a/lisp/gnus/mm-extern.el	Mon May 10 20:18:58 2010 -0700
+++ b/lisp/gnus/mm-extern.el	Tue May 11 04:44:44 2010 +0000
@@ -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