(url-file, url-file-asynch-callback): Use with-current-buffer.

2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 27981553e83..dc129c0c1fd 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-file.el (url-file, url-file-asynch-callback): with-current-buffer.
+
 2005-06-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-dav.el: Remove most autoload cookies.
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 0aa23acc0ec..c39d255304b 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -73,8 +73,7 @@ to them."
             func args
             args efs))
   (let ((size (nth 7 (file-attributes name))))
-    (save-excursion
-      (set-buffer buff)
+    (with-current-buffer buff
       (goto-char (point-max))
       (if (/= -1 size)
           (insert (format "Content-length: %d\n" size)))
@@ -177,9 +176,8 @@ to them."
     (if (file-directory-p filename)
         ;; A directory is done the same whether we are local or remote
         (url-find-file-dired filename)
-      (save-excursion
-        (setq buffer (generate-new-buffer " *url-file*"))
-        (set-buffer buffer)
+      (with-current-buffer
+          (setq buffer (generate-new-buffer " *url-file*"))
         (mm-disable-multibyte)
         (setq url-current-object url)
         (insert "Content-type: " (or content-type "application/octet-stream") "\n")