aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorPaul Eggert2019-02-10 23:47:43 -0800
committerPaul Eggert2019-02-10 23:54:34 -0800
commit57c74793c46c6533b63836f00aecaf3ac2accb6d (patch)
tree5ceb3f9e765c4240069f92653d1648ca1137887c /lisp/url
parent54b9ee77adca44299fe8f4342498a082608b4d1b (diff)
downloademacs-57c74793c46c6533b63836f00aecaf3ac2accb6d.tar.gz
emacs-57c74793c46c6533b63836f00aecaf3ac2accb6d.zip
Prefer encode-time to its alias
* lisp/calendar/icalendar.el, lisp/calendar/timeclock.el: * lisp/emacs-lisp/timer.el, lisp/gnus/gnus-delay.el: * lisp/gnus/gnus-sum.el, lisp/gnus/nndiary.el: * lisp/gnus/nnrss.el, lisp/net/newst-backend.el: * lisp/net/rcirc.el, lisp/obsolete/xesam.el: * lisp/org/org-agenda.el, lisp/org/org-clock.el: * lisp/org/org-element.el, lisp/org/org-timer.el: * lisp/org/org.el, lisp/progmodes/flymake.el: * lisp/url/url-cache.el, lisp/url/url-cookie.el: Use encode-time instead of its alias seconds-to-time.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-cache.el4
-rw-r--r--lisp/url/url-cookie.el4
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 66a7223bc89..a1cb0b9274e 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."
205 (time-less-p 205 (time-less-p
206 (time-add 206 (time-add
207 cache-time 207 cache-time
208 (seconds-to-time (or expire-time url-cache-expire-time))) 208 (encode-time (or expire-time url-cache-expire-time)))
209 nil))))) 209 nil)))))
210 210
211(defun url-cache-prune-cache (&optional directory) 211(defun url-cache-prune-cache (&optional directory)
@@ -227,7 +227,7 @@ considered \"expired\"."
227 ((time-less-p 227 ((time-less-p
228 (time-add 228 (time-add
229 (file-attribute-modification-time (file-attributes file)) 229 (file-attribute-modification-time (file-attributes file))
230 (seconds-to-time url-cache-expire-time)) 230 (encode-time url-cache-expire-time))
231 now) 231 now)
232 (delete-file file) 232 (delete-file file)
233 (setq deleted-files (1+ deleted-files)))))) 233 (setq deleted-files (1+ deleted-files))))))
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 0c276388185..213dab268c9 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -105,10 +105,10 @@ i.e. 1970-1-1) are loaded as expiring one year from now instead."
105 ;; away, make it expire a year from now 105 ;; away, make it expire a year from now
106 (expires (format-time-string 106 (expires (format-time-string
107 "%d %b %Y %T [GMT]" 107 "%d %b %Y %T [GMT]"
108 (seconds-to-time 108 (encode-time
109 (let ((s (string-to-number (nth 4 fields)))) 109 (let ((s (string-to-number (nth 4 fields))))
110 (if (and (= s 0) long-session) 110 (if (and (= s 0) long-session)
111 (seconds-to-time (+ (* 365 24 60 60) (float-time))) 111 (encode-time (+ (* 365 24 60 60) (float-time)))
112 s))))) 112 s)))))
113 (key (nth 5 fields)) 113 (key (nth 5 fields))
114 (val (nth 6 fields))) 114 (val (nth 6 fields)))