From: Glenn Morris <rgm@gnu.org>
Date: Thu, 23 Sep 2010 06:04:01 +0000 (-0700)
Subject: Fix previous url-cache fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~88
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ea8e1744cd7349e854de27d615bb78fb94a6bd6;p=emacs.git

Fix previous url-cache fix.
---

diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 22095eb631d..677e03c37f3 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -198,12 +198,12 @@ 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))))))
+      (or (not cache-time)
+	  (time-less-p
+	   (time-add
+	    cache-time
+	    (seconds-to-time (or expire-time url-cache-expire-time)))
+	   (current-time))))))
 
 (provide 'url-cache)