[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100028: * lisp/url/url-cache (url-store-in-cache): Make `buff' argument really optional.

[Glenn Morris]

------------------------------------------------------------
revno: 100028
author: Julien Danjou <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-09-10 18:55:55 -0700
message:
  * lisp/url/url-cache (url-store-in-cache): Make `buff' argument really 
optional.
modified:
  lisp/url/ChangeLog
  lisp/url/url-cache.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-09-09 05:38:43 +0000
+++ b/lisp/url/ChangeLog        2010-09-11 01:55:55 +0000
@@ -1,3 +1,7 @@
+2010-09-11  Julien Danjou  <address@hidden>
+
+       * url-cache (url-store-in-cache): Make `buff' argument really optional.
+
 2010-09-09  Glenn Morris  <address@hidden>
 
        * url-cookie.el (url-cookie-expired-p): Tweak previous change.

=== modified file 'lisp/url/url-cache.el'
--- a/lisp/url/url-cache.el     2010-01-13 08:35:10 +0000
+++ b/lisp/url/url-cache.el     2010-09-11 01:55:55 +0000
@@ -62,14 +62,11 @@
 ;;;###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)