From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Julien Danjou Newsgroups: gmane.emacs.devel Subject: [PATCH] url-cache (url-store-in-cache): Make `buff' argument really optional Date: Wed, 8 Sep 2010 14:51:00 +0200 Message-ID: <1283950260-13227-1-git-send-email-julien@danjou.info> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1283950288 20079 80.91.229.12 (8 Sep 2010 12:51:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 8 Sep 2010 12:51:28 +0000 (UTC) Cc: Julien Danjou To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 08 14:51:25 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OtK7V-0000wJ-FV for ged-emacs-devel@m.gmane.org; Wed, 08 Sep 2010 14:51:21 +0200 Original-Received: from localhost ([127.0.0.1]:53742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtK7U-0007qZ-Tx for ged-emacs-devel@m.gmane.org; Wed, 08 Sep 2010 08:51:20 -0400 Original-Received: from [140.186.70.92] (port=59535 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtK7P-0007pc-4J for emacs-devel@gnu.org; Wed, 08 Sep 2010 08:51:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtK7M-0006q3-Ua for emacs-devel@gnu.org; Wed, 08 Sep 2010 08:51:15 -0400 Original-Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:39266) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtK7M-0006pO-PB for emacs-devel@gnu.org; Wed, 08 Sep 2010 08:51:12 -0400 Original-Received: from cigue.easter-eggs.fr (cigue.easter-eggs.fr [10.0.0.33]) by rose.easter-eggs.fr (Postfix) with ESMTPS id E0E7D140D4; Wed, 8 Sep 2010 14:51:05 +0200 (CEST) Original-Received: from jdanjou by cigue.easter-eggs.fr with local (Exim 4.72) (envelope-from ) id 1OtK7K-0003Rp-2w; Wed, 08 Sep 2010 14:51:10 +0200 X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:129780 Archived-At: Currently, `buff' is marked as optional, but if it is set to nil, the function does nothing. Signed-off-by: Julien Danjou --- 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 + + * url-cache (url-store-in-cache): Make `buff' argument really + optional by using (current-buffer) if `buff' is nil. + 2010-07-27 Michael Albinus * 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