Merge changes from emacs-23 branch

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 02e135bf7a4..0d1645b25c3 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-23  Glenn Morris  <rgm@gnu.org>
 
+        * url-cache.el (url-is-cached): Doc fix.
+
+2010-09-23  Glenn Morris  <rgm@gnu.org>
+
         * url-cache.el (url-cache-expired): Don't autoload.
         Tweak previous change.
         (url-cache-expire-time): Doc fix.
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 418a8e22672..53222cbc4e6 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -83,7 +83,8 @@ FILE can be created or overwritten."
 
 ;;;###autoload
 (defun url-is-cached (url)
-  "Return non-nil if the URL is cached."
+  "Return non-nil if the URL is cached.
+The actual return value is the last modification time of the cache file."
   (let* ((fname (url-cache-create-filename url))
          (attribs (file-attributes fname)))
     (and fname                          ; got a filename