Mercurial > emacs
changeset 110491:3501c2b9e719
* url-cache.el (url-cache-expired): Don't autoload. Tweak previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 22 Sep 2010 22:59:20 -0700 |
| parents | 7c3194dcf52d |
| children | 874fdd55f8e9 |
| files | lisp/url/ChangeLog lisp/url/url-cache.el |
| diffstat | 2 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/ChangeLog Wed Sep 22 22:56:17 2010 -0700 +++ b/lisp/url/ChangeLog Wed Sep 22 22:59:20 2010 -0700 @@ -1,3 +1,8 @@ +2010-09-23 Glenn Morris <rgm@gnu.org> + + * url-cache.el (url-cache-expired): Don't autoload. + Tweak previous change. + 2010-09-23 Julien Danjou <julien@danjou.info> * url-cache.el (url-cache-expire-time): New option.
--- a/lisp/url/url-cache.el Wed Sep 22 22:56:17 2010 -0700 +++ b/lisp/url/url-cache.el Wed Sep 22 22:59:20 2010 -0700 @@ -191,20 +191,19 @@ (erase-buffer) (insert-file-contents-literally fnam)) -;;;###autoload (defun url-cache-expired (url &optional expire-time) - "Return t if a cached URL is more than EXPIRE-TIME old. -If EXPIRE-TIME is not set, `url-cache-expire-time' is used instead." - (cond (url-standalone-mode - (not (file-exists-p (url-cache-create-filename url)))) - (t (let ((cache-time (url-is-cached url))) - (if cache-time - (time-less-p - (time-add - (url-is-cached url) - (seconds-to-time (or expire-time url-cache-expire-time))) - (current-time)) - t))))) + "Return non-nil if a cached URL is older than EXPIRE-TIME seconds. +The default value of EXPIRE-TIME is `url-cache-expire-time'. +If `url-standalone-mode' is non-nil, cached items never expire." + (if url-standalone-mode + (not (file-exists-p (url-cache-create-filename url))) + (let ((cache-time (url-is-cached url))) + (and cache-time + (time-less-p + (time-add + cache-time + (seconds-to-time (or expire-time url-cache-expire-time))) + (current-time)))))) (provide 'url-cache)