* lisp/url/url-cache (url-store-in-cache): Make `buff' argument really optional.

2 files changed, 9 insertions, 8 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 11d48f97fbf..c8defd459cd 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-11  Julien Danjou  <julien@danjou.info>
+
+        * url-cache (url-store-in-cache): Make `buff' argument really optional.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
         * url-cookie.el (url-cookie-expired-p): Tweak previous change.
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 71841c9a0ca..ebd9f6123ff 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -62,14 +62,11 @@ FILE can be created or overwritten."
 ;;;###autoload
 (defun url-store-in-cache (&optional buff)
   "Store buffer BUFF in the cache."
-  (if (not (and buff (get-buffer buff)))
-      nil
-    (save-current-buffer
-      (and buff (set-buffer buff))
-      (let* ((fname (url-cache-create-filename (url-view-url t))))
-        (if (url-cache-prepare fname)
-            (let ((coding-system-for-write 'binary))
-              (write-region (point-min) (point-max) fname nil 5)))))))
+    (with-current-buffer (get-buffer (or buff (current-buffer)))
+      (let ((fname (url-cache-create-filename (url-view-url t))))
+        (if (url-cache-prepare fname)
+            (let ((coding-system-for-write 'binary))
+              (write-region (point-min) (point-max) fname nil 5))))))
 
 ;;;###autoload
 (defun url-is-cached (url)