[PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Julien Danjou]

Currently, `buff' is marked as optional, but if it is set to nil, the
function does nothing.

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/url/ChangeLog    |    5 +++++
 lisp/url/url-cache.el |   13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e3f76e7..2a69b48 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Julien Danjou  <julien@danjou.info>
+
+	* url-cache (url-store-in-cache): Make `buff' argument really
+	optional by using (current-buffer) if `buff' is nil.
+
 2010-07-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* url-http (url-http-parse-headers): Disable file name handlers at
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 71841c9..ebd9f61 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)
-- 
1.7.1

Re: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Glenn Morris]

Julien Danjou wrote:

>  (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))))))


I think the original version was attempting to guard against the
possibility of BUFF naming a dead or non-existent buffer, and your
version has lost that feature.

Re: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Glenn Morris]

Glenn Morris wrote:

> I think the original version was attempting to guard against the
> possibility of BUFF naming a dead or non-existent buffer, and your
> version has lost that feature.

That was a dumb comment (better to throw an error than do nothing).
I'll install your version.

Re: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Julien Danjou]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

On Fri, Sep 10 2010, Glenn Morris wrote:

> That was a dumb comment (better to throw an error than do nothing).

No problem. ;)

> I'll install your version.

Thanks Glenn. :)

-- 
Julien Danjou
// ᐰ <julien@danjou.info>   http://julien.danjou.info

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Julien Danjou]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

On Fri, Sep 10 2010, Glenn Morris wrote:

> That was a dumb comment (better to throw an error than do nothing).
> I'll install your version.

Glenn, I don't see it. Did you miss it?

-- 
Julien Danjou
// ᐰ <julien@danjou.info>   http://julien.danjou.info

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional

[Glenn Morris]

Julien Danjou wrote:

>> I'll install your version.
>
> Glenn, I don't see it. Did you miss it?

Check the emacs-23 branch, and wait for it to be merged to the trunk.