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

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 27981553e8391593d540355afaa45df099914b62..dc129c0c1fd4d3c2c321f8838599e18c8b490db2 100644 (file)
--- 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 0aa23acc0ec251000db60c765e01ad99bdde5667..c39d255304bad8691e63ea80885b1fdd5e740526 100644 (file)
--- 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")