diff options
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/url-cache.el | 4 | ||||
| -rw-r--r-- | lisp/url/url-cookie.el | 9 | ||||
| -rw-r--r-- | lisp/url/url-queue.el | 4 | ||||
| -rw-r--r-- | lisp/url/url.el | 3 |
4 files changed, 9 insertions, 11 deletions
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index a1cb0b9274e..b306082c3ba 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -205,7 +205,7 @@ If `url-standalone-mode' is non-nil, cached items never expire." (time-less-p (time-add cache-time - (encode-time (or expire-time url-cache-expire-time))) + (or expire-time url-cache-expire-time)) nil))))) (defun url-cache-prune-cache (&optional directory) @@ -227,7 +227,7 @@ considered \"expired\"." ((time-less-p (time-add (file-attribute-modification-time (file-attributes file)) - (encode-time url-cache-expire-time)) + url-cache-expire-time) now) (delete-file file) (setq deleted-files (1+ deleted-files)))))) diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 213dab268c9..31fc3e72664 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -105,11 +105,10 @@ i.e. 1970-1-1) are loaded as expiring one year from now instead." ;; away, make it expire a year from now (expires (format-time-string "%d %b %Y %T [GMT]" - (encode-time - (let ((s (string-to-number (nth 4 fields)))) - (if (and (= s 0) long-session) - (encode-time (+ (* 365 24 60 60) (float-time))) - s))))) + (let ((s (string-to-number (nth 4 fields)))) + (if (and (zerop s) long-session) + (time-add nil (* 365 24 60 60)) + s)))) (key (nth 5 fields)) (val (nth 6 fields))) (cl-incf n) diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el index 6350081b1a3..9bf1bca238d 100644 --- a/lisp/url/url-queue.el +++ b/lisp/url/url-queue.el @@ -162,8 +162,8 @@ The variable `url-queue-timeout' sets a timeout." (dolist (job url-queue) ;; Kill jobs that have lasted longer than the timeout. (when (and (url-queue-start-time job) - (> (- (float-time) (url-queue-start-time job)) - url-queue-timeout)) + (time-less-p url-queue-timeout + (time-since (url-queue-start-time job)))) (push job dead-jobs))) (dolist (job dead-jobs) (url-queue-kill-job job) diff --git a/lisp/url/url.el b/lisp/url/url.el index 101c2b2c541..ed0947795b0 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -259,8 +259,7 @@ how long to wait for a response before giving up." ;; process output. (while (and (not retrieval-done) (or (not timeout) - (< (float-time (time-subtract nil start-time)) - timeout))) + (time-less-p (time-since start-time) timeout))) (url-debug 'retrieval "Spinning in url-retrieve-synchronously: %S (%S)" retrieval-done asynch-buffer) |