diff options
| -rw-r--r-- | lisp/calendar/icalendar.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/timeclock.el | 12 | ||||
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-delay.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nndiary.el | 12 | ||||
| -rw-r--r-- | lisp/gnus/nnrss.el | 2 | ||||
| -rw-r--r-- | lisp/net/newst-backend.el | 4 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 4 | ||||
| -rw-r--r-- | lisp/obsolete/xesam.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-agenda.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-clock.el | 14 | ||||
| -rw-r--r-- | lisp/org/org-element.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-timer.el | 8 | ||||
| -rw-r--r-- | lisp/org/org.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/flymake.el | 2 | ||||
| -rw-r--r-- | lisp/url/url-cache.el | 4 | ||||
| -rw-r--r-- | lisp/url/url-cookie.el | 4 |
18 files changed, 45 insertions, 45 deletions
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 3bcb7520e29..31ace6fb9be 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el | |||
| @@ -1621,7 +1621,7 @@ enumeration, given as a time value, in same format as returned by | |||
| 1621 | (mapcar | 1621 | (mapcar |
| 1622 | (lambda (offset) | 1622 | (lambda (offset) |
| 1623 | (let* ((day (decode-time (time-add now | 1623 | (let* ((day (decode-time (time-add now |
| 1624 | (seconds-to-time | 1624 | (encode-time |
| 1625 | (* offset 60 60 24))))) | 1625 | (* offset 60 60 24))))) |
| 1626 | (d (nth 3 day)) | 1626 | (d (nth 3 day)) |
| 1627 | (m (nth 4 day)) | 1627 | (m (nth 4 day)) |
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 0562f4a998d..fd6f5310c8d 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el | |||
| @@ -528,7 +528,7 @@ non-nil, the amount returned will be relative to past time worked." | |||
| 528 | "Return a time value representing the end of today's workday. | 528 | "Return a time value representing the end of today's workday. |
| 529 | If TODAY-ONLY is non-nil, the value returned will be relative only to | 529 | If TODAY-ONLY is non-nil, the value returned will be relative only to |
| 530 | the time worked today, and not to past time." | 530 | the time worked today, and not to past time." |
| 531 | (seconds-to-time | 531 | (encode-time |
| 532 | (- (float-time) | 532 | (- (float-time) |
| 533 | (let ((discrep (timeclock-find-discrep))) | 533 | (let ((discrep (timeclock-find-discrep))) |
| 534 | (if discrep | 534 | (if discrep |
| @@ -1196,7 +1196,7 @@ HTML-P is non-nil, HTML markup is added." | |||
| 1196 | (insert project "</b><br>\n") | 1196 | (insert project "</b><br>\n") |
| 1197 | (insert project "*\n")) | 1197 | (insert project "*\n")) |
| 1198 | (let ((proj-data (cdr (assoc project (timeclock-project-alist log)))) | 1198 | (let ((proj-data (cdr (assoc project (timeclock-project-alist log)))) |
| 1199 | (two-weeks-ago (seconds-to-time | 1199 | (two-weeks-ago (encode-time |
| 1200 | (- (float-time today) | 1200 | (- (float-time today) |
| 1201 | (* 2 7 24 60 60)))) | 1201 | (* 2 7 24 60 60)))) |
| 1202 | two-week-len today-len) | 1202 | two-week-len today-len) |
| @@ -1249,16 +1249,16 @@ HTML-P is non-nil, HTML markup is added." | |||
| 1249 | <th>-1 year</th> | 1249 | <th>-1 year</th> |
| 1250 | </tr>") | 1250 | </tr>") |
| 1251 | (let* ((day-list (timeclock-day-list)) | 1251 | (let* ((day-list (timeclock-day-list)) |
| 1252 | (thirty-days-ago (seconds-to-time | 1252 | (thirty-days-ago (encode-time |
| 1253 | (- (float-time today) | 1253 | (- (float-time today) |
| 1254 | (* 30 24 60 60)))) | 1254 | (* 30 24 60 60)))) |
| 1255 | (three-months-ago (seconds-to-time | 1255 | (three-months-ago (encode-time |
| 1256 | (- (float-time today) | 1256 | (- (float-time today) |
| 1257 | (* 90 24 60 60)))) | 1257 | (* 90 24 60 60)))) |
| 1258 | (six-months-ago (seconds-to-time | 1258 | (six-months-ago (encode-time |
| 1259 | (- (float-time today) | 1259 | (- (float-time today) |
| 1260 | (* 180 24 60 60)))) | 1260 | (* 180 24 60 60)))) |
| 1261 | (one-year-ago (seconds-to-time | 1261 | (one-year-ago (encode-time |
| 1262 | (- (float-time today) | 1262 | (- (float-time today) |
| 1263 | (* 365 24 60 60)))) | 1263 | (* 365 24 60 60)))) |
| 1264 | (time-in (vector (list t) (list t) (list t) (list t) (list t))) | 1264 | (time-in (vector (list t) (list t) (list t) (list t) (list t))) |
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 4bd19b74a95..f77c9457860 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el | |||
| @@ -88,7 +88,7 @@ SECS may be an integer, floating point number, or the internal | |||
| 88 | time format returned by, e.g., `current-idle-time'. | 88 | time format returned by, e.g., `current-idle-time'. |
| 89 | If optional third argument REPEAT is non-nil, make the timer | 89 | If optional third argument REPEAT is non-nil, make the timer |
| 90 | fire each time Emacs is idle for that many seconds." | 90 | fire each time Emacs is idle for that many seconds." |
| 91 | (setf (timer--time timer) (if (consp secs) secs (seconds-to-time secs))) | 91 | (setf (timer--time timer) (if (consp secs) secs (encode-time secs))) |
| 92 | (setf (timer--repeat-delay timer) repeat) | 92 | (setf (timer--repeat-delay timer) repeat) |
| 93 | timer) | 93 | timer) |
| 94 | 94 | ||
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el index d1ff7e6116d..e013f26adf2 100644 --- a/lisp/gnus/gnus-delay.el +++ b/lisp/gnus/gnus-delay.el | |||
| @@ -110,7 +110,7 @@ DELAY is a string, giving the length of the time. Possible values are: | |||
| 110 | (setq deadline (+ 86400 deadline))) ; 86400 secs/day | 110 | (setq deadline (+ 86400 deadline))) ; 86400 secs/day |
| 111 | ;; Convert seconds to date header. | 111 | ;; Convert seconds to date header. |
| 112 | (setq deadline (message-make-date | 112 | (setq deadline (message-make-date |
| 113 | (seconds-to-time deadline)))) | 113 | (encode-time deadline)))) |
| 114 | ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay) | 114 | ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay) |
| 115 | (setq num (match-string 1 delay)) | 115 | (setq num (match-string 1 delay)) |
| 116 | (setq unit (match-string 2 delay)) | 116 | (setq unit (match-string 2 delay)) |
| @@ -129,7 +129,7 @@ DELAY is a string, giving the length of the time. Possible values are: | |||
| 129 | (t | 129 | (t |
| 130 | (setq delay (* num 60)))) | 130 | (setq delay (* num 60)))) |
| 131 | (setq deadline (message-make-date | 131 | (setq deadline (message-make-date |
| 132 | (seconds-to-time (+ (float-time) delay))))) | 132 | (encode-time (+ (float-time) delay))))) |
| 133 | (t (error "Malformed delay `%s'" delay))) | 133 | (t (error "Malformed delay `%s'" delay))) |
| 134 | (message-add-header (format "%s: %s" gnus-delay-header deadline))) | 134 | (message-add-header (format "%s: %s" gnus-delay-header deadline))) |
| 135 | (set-buffer-modified-p t) | 135 | (set-buffer-modified-p t) |
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 911bf89f237..3a5886a8636 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el | |||
| @@ -3868,7 +3868,7 @@ Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"." | |||
| 3868 | (setq top (eval (caar templist))))) | 3868 | (setq top (eval (caar templist))))) |
| 3869 | (if (stringp (cdr (car templist))) | 3869 | (if (stringp (cdr (car templist))) |
| 3870 | (setq my-format (cdr (car templist))))) | 3870 | (setq my-format (cdr (car templist))))) |
| 3871 | (format-time-string (eval my-format) (seconds-to-time messy-date))) | 3871 | (format-time-string (eval my-format) (encode-time messy-date))) |
| 3872 | (error " ? "))) | 3872 | (error " ? "))) |
| 3873 | 3873 | ||
| 3874 | (defun gnus-summary-set-local-parameters (group) | 3874 | (defun gnus-summary-set-local-parameters (group) |
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index c65f78d3087..3798be10582 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el | |||
| @@ -1279,27 +1279,27 @@ all. This may very well take some time.") | |||
| 1279 | (cond ((eq (cdr reminder) 'minute) | 1279 | (cond ((eq (cdr reminder) 'minute) |
| 1280 | (time-subtract | 1280 | (time-subtract |
| 1281 | (apply 'encode-time 0 (nthcdr 1 date-elts)) | 1281 | (apply 'encode-time 0 (nthcdr 1 date-elts)) |
| 1282 | (seconds-to-time (* (car reminder) 60.0)))) | 1282 | (encode-time (* (car reminder) 60.0)))) |
| 1283 | ((eq (cdr reminder) 'hour) | 1283 | ((eq (cdr reminder) 'hour) |
| 1284 | (time-subtract | 1284 | (time-subtract |
| 1285 | (apply 'encode-time 0 0 (nthcdr 2 date-elts)) | 1285 | (apply 'encode-time 0 0 (nthcdr 2 date-elts)) |
| 1286 | (seconds-to-time (* (car reminder) 3600.0)))) | 1286 | (encode-time (* (car reminder) 3600.0)))) |
| 1287 | ((eq (cdr reminder) 'day) | 1287 | ((eq (cdr reminder) 'day) |
| 1288 | (time-subtract | 1288 | (time-subtract |
| 1289 | (apply 'encode-time 0 0 0 (nthcdr 3 date-elts)) | 1289 | (apply 'encode-time 0 0 0 (nthcdr 3 date-elts)) |
| 1290 | (seconds-to-time (* (car reminder) 86400.0)))) | 1290 | (encode-time (* (car reminder) 86400.0)))) |
| 1291 | ((eq (cdr reminder) 'week) | 1291 | ((eq (cdr reminder) 'week) |
| 1292 | (time-subtract | 1292 | (time-subtract |
| 1293 | (apply 'encode-time 0 0 0 monday (nthcdr 4 date-elts)) | 1293 | (apply 'encode-time 0 0 0 monday (nthcdr 4 date-elts)) |
| 1294 | (seconds-to-time (* (car reminder) 604800.0)))) | 1294 | (encode-time (* (car reminder) 604800.0)))) |
| 1295 | ((eq (cdr reminder) 'month) | 1295 | ((eq (cdr reminder) 'month) |
| 1296 | (time-subtract | 1296 | (time-subtract |
| 1297 | (apply 'encode-time 0 0 0 1 (nthcdr 4 date-elts)) | 1297 | (apply 'encode-time 0 0 0 1 (nthcdr 4 date-elts)) |
| 1298 | (seconds-to-time (* (car reminder) 18748800.0)))) | 1298 | (encode-time (* (car reminder) 18748800.0)))) |
| 1299 | ((eq (cdr reminder) 'year) | 1299 | ((eq (cdr reminder) 'year) |
| 1300 | (time-subtract | 1300 | (time-subtract |
| 1301 | (apply 'encode-time 0 0 0 1 1 (nthcdr 5 date-elts)) | 1301 | (apply 'encode-time 0 0 0 1 1 (nthcdr 5 date-elts)) |
| 1302 | (seconds-to-time (* (car reminder) 400861056.0))))) | 1302 | (encode-time (* (car reminder) 400861056.0))))) |
| 1303 | res)) | 1303 | res)) |
| 1304 | (sort res 'time-less-p))) | 1304 | (sort res 'time-less-p))) |
| 1305 | 1305 | ||
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index db37e24b903..6a475966641 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el | |||
| @@ -454,7 +454,7 @@ which RSS 2.0 allows." | |||
| 454 | (cond ((null date)) ; do nothing for this case | 454 | (cond ((null date)) ; do nothing for this case |
| 455 | ;; if the date is just digits (unix time stamp): | 455 | ;; if the date is just digits (unix time stamp): |
| 456 | ((string-match "^[0-9]+$" date) | 456 | ((string-match "^[0-9]+$" date) |
| 457 | (setq given (seconds-to-time (string-to-number date)))) | 457 | (setq given (encode-time (string-to-number date)))) |
| 458 | ;; RFC822 | 458 | ;; RFC822 |
| 459 | ((string-match " [0-9]+ " date) | 459 | ((string-match " [0-9]+ " date) |
| 460 | (setq vector (timezone-parse-date date) | 460 | (setq vector (timezone-parse-date date) |
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 61c743755bd..ac58ed9fa7e 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el | |||
| @@ -1802,7 +1802,7 @@ download it from URL first." | |||
| 1802 | (time-less-p nil | 1802 | (time-less-p nil |
| 1803 | (time-add (file-attribute-modification-time | 1803 | (time-add (file-attribute-modification-time |
| 1804 | (file-attributes image-name)) | 1804 | (file-attributes image-name)) |
| 1805 | (seconds-to-time 86400)))) | 1805 | (encode-time 86400)))) |
| 1806 | (newsticker--debug-msg "%s: Getting image for %s skipped" | 1806 | (newsticker--debug-msg "%s: Getting image for %s skipped" |
| 1807 | (format-time-string "%A, %H:%M") | 1807 | (format-time-string "%A, %H:%M") |
| 1808 | feed-name) | 1808 | feed-name) |
| @@ -1996,7 +1996,7 @@ older than TIME." | |||
| 1996 | (lambda (item) | 1996 | (lambda (item) |
| 1997 | (when (eq (newsticker--age item) old-age) | 1997 | (when (eq (newsticker--age item) old-age) |
| 1998 | (let ((exp-time (time-add (newsticker--time item) | 1998 | (let ((exp-time (time-add (newsticker--time item) |
| 1999 | (seconds-to-time time)))) | 1999 | (encode-time time)))) |
| 2000 | (when (time-less-p exp-time nil) | 2000 | (when (time-less-p exp-time nil) |
| 2001 | (newsticker--debug-msg | 2001 | (newsticker--debug-msg |
| 2002 | "Item `%s' from %s has expired on %s" | 2002 | "Item `%s' from %s has expired on %s" |
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 47681ccfe79..24f1c424dc8 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -2794,7 +2794,7 @@ the only argument." | |||
| 2794 | (let* ((nick (nth 1 args)) | 2794 | (let* ((nick (nth 1 args)) |
| 2795 | (idle-secs (string-to-number (nth 2 args))) | 2795 | (idle-secs (string-to-number (nth 2 args))) |
| 2796 | (idle-string (format-seconds "%yy %dd %hh %mm %z%ss" idle-secs)) | 2796 | (idle-string (format-seconds "%yy %dd %hh %mm %z%ss" idle-secs)) |
| 2797 | (signon-time (seconds-to-time (string-to-number (nth 3 args)))) | 2797 | (signon-time (encode-time (string-to-number (nth 3 args)))) |
| 2798 | (signon-string (format-time-string "%c" signon-time)) | 2798 | (signon-string (format-time-string "%c" signon-time)) |
| 2799 | (message (format "%s idle for %s, signed on %s" | 2799 | (message (format "%s idle for %s, signed on %s" |
| 2800 | nick idle-string signon-string))) | 2800 | nick idle-string signon-string))) |
| @@ -2815,7 +2815,7 @@ Not in rfc1459.txt" | |||
| 2815 | (with-current-buffer buffer | 2815 | (with-current-buffer buffer |
| 2816 | (let ((setter (nth 2 args)) | 2816 | (let ((setter (nth 2 args)) |
| 2817 | (time (current-time-string | 2817 | (time (current-time-string |
| 2818 | (seconds-to-time | 2818 | (encode-time |
| 2819 | (string-to-number (cl-cadddr args)))))) | 2819 | (string-to-number (cl-cadddr args)))))) |
| 2820 | (rcirc-print process sender "TOPIC" (cadr args) | 2820 | (rcirc-print process sender "TOPIC" (cadr args) |
| 2821 | (format "%s (%s on %s)" rcirc-topic setter time)))))) | 2821 | (format "%s (%s on %s)" rcirc-topic setter time)))))) |
diff --git a/lisp/obsolete/xesam.el b/lisp/obsolete/xesam.el index 95ddb2c0b8e..a1a4639a234 100644 --- a/lisp/obsolete/xesam.el +++ b/lisp/obsolete/xesam.el | |||
| @@ -622,7 +622,7 @@ Return propertized STRING." | |||
| 622 | (or (widget-get widget :tag) "") | 622 | (or (widget-get widget :tag) "") |
| 623 | (format-time-string | 623 | (format-time-string |
| 624 | "%d %B %Y, %T" | 624 | "%d %B %Y, %T" |
| 625 | (seconds-to-time | 625 | (encode-time |
| 626 | (string-to-number (widget-get widget :xesam:sourceModified))))))) | 626 | (string-to-number (widget-get widget :xesam:sourceModified))))))) |
| 627 | 627 | ||
| 628 | ;; Second line: :value. | 628 | ;; Second line: :value. |
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 6f66807ab57..6cc5214306a 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el | |||
| @@ -5914,8 +5914,8 @@ See also the user option `org-agenda-clock-consistency-checks'." | |||
| 5914 | (throw 'exit t)) | 5914 | (throw 'exit t)) |
| 5915 | ;; We have a shorter gap. | 5915 | ;; We have a shorter gap. |
| 5916 | ;; Now we have to get the minute of the day when these times are | 5916 | ;; Now we have to get the minute of the day when these times are |
| 5917 | (let* ((t1dec (decode-time (seconds-to-time t1))) | 5917 | (let* ((t1dec (decode-time (encode-time t1))) |
| 5918 | (t2dec (decode-time (seconds-to-time t2))) | 5918 | (t2dec (decode-time (encode-time t2))) |
| 5919 | ;; compute the minute on the day | 5919 | ;; compute the minute on the day |
| 5920 | (min1 (+ (nth 1 t1dec) (* 60 (nth 2 t1dec)))) | 5920 | (min1 (+ (nth 1 t1dec) (* 60 (nth 2 t1dec)))) |
| 5921 | (min2 (+ (nth 1 t2dec) (* 60 (nth 2 t2dec))))) | 5921 | (min2 (+ (nth 1 t2dec) (* 60 (nth 2 t2dec))))) |
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 9d05c836da7..b177450d33f 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el | |||
| @@ -1069,10 +1069,10 @@ to be CLOCKED OUT.")))) | |||
| 1069 | (and gotback (= gotback default))) | 1069 | (and gotback (= gotback default))) |
| 1070 | 'now) | 1070 | 'now) |
| 1071 | (keep | 1071 | (keep |
| 1072 | (time-add last-valid (seconds-to-time (* 60 keep)))) | 1072 | (time-add last-valid (encode-time (* 60 keep)))) |
| 1073 | (gotback | 1073 | (gotback |
| 1074 | (time-subtract (current-time) | 1074 | (time-subtract (current-time) |
| 1075 | (seconds-to-time (* 60 gotback)))) | 1075 | (encode-time (* 60 gotback)))) |
| 1076 | (t | 1076 | (t |
| 1077 | (error "Unexpected, please report this as a bug"))) | 1077 | (error "Unexpected, please report this as a bug"))) |
| 1078 | (and gotback last-valid) | 1078 | (and gotback last-valid) |
| @@ -1155,7 +1155,7 @@ so long." | |||
| 1155 | (let* ((org-clock-user-idle-seconds (org-user-idle-seconds)) | 1155 | (let* ((org-clock-user-idle-seconds (org-user-idle-seconds)) |
| 1156 | (org-clock-user-idle-start | 1156 | (org-clock-user-idle-start |
| 1157 | (time-subtract (current-time) | 1157 | (time-subtract (current-time) |
| 1158 | (seconds-to-time org-clock-user-idle-seconds))) | 1158 | (encode-time org-clock-user-idle-seconds))) |
| 1159 | (org-clock-resolving-clocks-due-to-idleness t)) | 1159 | (org-clock-resolving-clocks-due-to-idleness t)) |
| 1160 | (if (> org-clock-user-idle-seconds (* 60 org-clock-idle-time)) | 1160 | (if (> org-clock-user-idle-seconds (* 60 org-clock-idle-time)) |
| 1161 | (org-clock-resolve | 1161 | (org-clock-resolve |
| @@ -2714,14 +2714,14 @@ LEVEL is an integer. Indent by two spaces per level above 1." | |||
| 2714 | (setq te (float-time (apply #'encode-time (org-parse-time-string te)))))) | 2714 | (setq te (float-time (apply #'encode-time (org-parse-time-string te)))))) |
| 2715 | (setq tsb | 2715 | (setq tsb |
| 2716 | (if (eq step0 'week) | 2716 | (if (eq step0 'week) |
| 2717 | (let ((dow (nth 6 (decode-time (seconds-to-time ts))))) | 2717 | (let ((dow (nth 6 (decode-time (encode-time ts))))) |
| 2718 | (if (<= dow ws) ts | 2718 | (if (<= dow ws) ts |
| 2719 | (- ts (* 86400 (- dow ws))))) | 2719 | (- ts (* 86400 (- dow ws))))) |
| 2720 | ts)) | 2720 | ts)) |
| 2721 | (while (< tsb te) | 2721 | (while (< tsb te) |
| 2722 | (unless (bolp) (insert "\n")) | 2722 | (unless (bolp) (insert "\n")) |
| 2723 | (let ((start-time (seconds-to-time (max tsb ts)))) | 2723 | (let ((start-time (encode-time (max tsb ts)))) |
| 2724 | (cl-incf tsb (let ((dow (nth 6 (decode-time (seconds-to-time tsb))))) | 2724 | (cl-incf tsb (let ((dow (nth 6 (decode-time (encode-time tsb))))) |
| 2725 | (if (or (eq step0 'day) | 2725 | (if (or (eq step0 'day) |
| 2726 | (= dow ws)) | 2726 | (= dow ws)) |
| 2727 | step | 2727 | step |
| @@ -2741,7 +2741,7 @@ LEVEL is an integer. Indent by two spaces per level above 1." | |||
| 2741 | :tstart (format-time-string (org-time-stamp-format t t) | 2741 | :tstart (format-time-string (org-time-stamp-format t t) |
| 2742 | start-time) | 2742 | start-time) |
| 2743 | :tend (format-time-string (org-time-stamp-format t t) | 2743 | :tend (format-time-string (org-time-stamp-format t t) |
| 2744 | (seconds-to-time (min te tsb)))))))) | 2744 | (encode-time (min te tsb)))))))) |
| 2745 | (re-search-forward "^[ \t]*#\\+END:") | 2745 | (re-search-forward "^[ \t]*#\\+END:") |
| 2746 | (when (and stepskip0 (equal step-time 0)) | 2746 | (when (and stepskip0 (equal step-time 0)) |
| 2747 | ;; Remove the empty table | 2747 | ;; Remove the empty table |
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index 75d46e2312c..e2ee0a0fe82 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el | |||
| @@ -4765,13 +4765,13 @@ you want to help debugging the issue.") | |||
| 4765 | (defvar org-element-cache-sync-idle-time 0.6 | 4765 | (defvar org-element-cache-sync-idle-time 0.6 |
| 4766 | "Length, in seconds, of idle time before syncing cache.") | 4766 | "Length, in seconds, of idle time before syncing cache.") |
| 4767 | 4767 | ||
| 4768 | (defvar org-element-cache-sync-duration (seconds-to-time 0.04) | 4768 | (defvar org-element-cache-sync-duration (encode-time 0.04) |
| 4769 | "Maximum duration, as a time value, for a cache synchronization. | 4769 | "Maximum duration, as a time value, for a cache synchronization. |
| 4770 | If the synchronization is not over after this delay, the process | 4770 | If the synchronization is not over after this delay, the process |
| 4771 | pauses and resumes after `org-element-cache-sync-break' | 4771 | pauses and resumes after `org-element-cache-sync-break' |
| 4772 | seconds.") | 4772 | seconds.") |
| 4773 | 4773 | ||
| 4774 | (defvar org-element-cache-sync-break (seconds-to-time 0.3) | 4774 | (defvar org-element-cache-sync-break (encode-time 0.3) |
| 4775 | "Duration, as a time value, of the pause between synchronizations. | 4775 | "Duration, as a time value, of the pause between synchronizations. |
| 4776 | See `org-element-cache-sync-duration' for more information.") | 4776 | See `org-element-cache-sync-duration' for more information.") |
| 4777 | 4777 | ||
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index bf17de4b03e..c9ca85c0c39 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/org-timer.el | |||
| @@ -140,7 +140,7 @@ the region 0:00:00." | |||
| 140 | (unless (string-match "\\S-" s) (setq s def)) | 140 | (unless (string-match "\\S-" s) (setq s def)) |
| 141 | (setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete s))))) | 141 | (setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete s))))) |
| 142 | (setq org-timer-start-time | 142 | (setq org-timer-start-time |
| 143 | (seconds-to-time | 143 | (encode-time |
| 144 | ;; Pass `current-time' result to `float-time' (instead | 144 | ;; Pass `current-time' result to `float-time' (instead |
| 145 | ;; of calling without arguments) so that only | 145 | ;; of calling without arguments) so that only |
| 146 | ;; `current-time' has to be overridden in tests. | 146 | ;; `current-time' has to be overridden in tests. |
| @@ -168,12 +168,12 @@ With prefix arg STOP, stop it entirely." | |||
| 168 | (org-timer--run-countdown-timer | 168 | (org-timer--run-countdown-timer |
| 169 | new-secs org-timer-countdown-timer-title)) | 169 | new-secs org-timer-countdown-timer-title)) |
| 170 | (setq org-timer-start-time | 170 | (setq org-timer-start-time |
| 171 | (time-add (current-time) (seconds-to-time new-secs)))) | 171 | (time-add (current-time) (encode-time new-secs)))) |
| 172 | (setq org-timer-start-time | 172 | (setq org-timer-start-time |
| 173 | ;; Pass `current-time' result to `float-time' (instead | 173 | ;; Pass `current-time' result to `float-time' (instead |
| 174 | ;; of calling without arguments) so that only | 174 | ;; of calling without arguments) so that only |
| 175 | ;; `current-time' has to be overridden in tests. | 175 | ;; `current-time' has to be overridden in tests. |
| 176 | (seconds-to-time (- (float-time (current-time)) | 176 | (encode-time (- (float-time (current-time)) |
| 177 | (- pause-secs start-secs))))) | 177 | (- pause-secs start-secs))))) |
| 178 | (setq org-timer-pause-time nil) | 178 | (setq org-timer-pause-time nil) |
| 179 | (org-timer-set-mode-line 'on) | 179 | (org-timer-set-mode-line 'on) |
| @@ -464,7 +464,7 @@ using three `C-u' prefix arguments." | |||
| 464 | secs org-timer-countdown-timer-title)) | 464 | secs org-timer-countdown-timer-title)) |
| 465 | (run-hooks 'org-timer-set-hook) | 465 | (run-hooks 'org-timer-set-hook) |
| 466 | (setq org-timer-start-time | 466 | (setq org-timer-start-time |
| 467 | (time-add (current-time) (seconds-to-time secs))) | 467 | (time-add (current-time) (encode-time secs))) |
| 468 | (setq org-timer-pause-time nil) | 468 | (setq org-timer-pause-time nil) |
| 469 | (org-timer-set-mode-line 'on)))))) | 469 | (org-timer-set-mode-line 'on)))))) |
| 470 | 470 | ||
diff --git a/lisp/org/org.el b/lisp/org/org.el index ef45ee66158..91a4799a21a 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -5621,7 +5621,7 @@ the rounding returns a past time." | |||
| 5621 | (append (list 0 (* r (floor (+ .5 (/ (float (nth 1 time)) r))))) | 5621 | (append (list 0 (* r (floor (+ .5 (/ (float (nth 1 time)) r))))) |
| 5622 | (nthcdr 2 time)))) | 5622 | (nthcdr 2 time)))) |
| 5623 | (if (and past (< (float-time (time-subtract (current-time) res)) 0)) | 5623 | (if (and past (< (float-time (time-subtract (current-time) res)) 0)) |
| 5624 | (seconds-to-time (- (float-time res) (* r 60))) | 5624 | (encode-time (- (float-time res) (* r 60))) |
| 5625 | res)))) | 5625 | res)))) |
| 5626 | 5626 | ||
| 5627 | (defun org-today () | 5627 | (defun org-today () |
| @@ -17796,7 +17796,7 @@ NODEFAULT, hour and minute fields will be nil if not given." | |||
| 17796 | ;; second argument. However, this requires at least Emacs | 17796 | ;; second argument. However, this requires at least Emacs |
| 17797 | ;; 25.1. We can do it when we switch to this version as our | 17797 | ;; 25.1. We can do it when we switch to this version as our |
| 17798 | ;; minimal requirement. | 17798 | ;; minimal requirement. |
| 17799 | (decode-time (seconds-to-time (org-matcher-time s)))) | 17799 | (decode-time (encode-time (org-matcher-time s)))) |
| 17800 | (t (error "Not a standard Org time string: %s" s)))) | 17800 | (t (error "Not a standard Org time string: %s" s)))) |
| 17801 | 17801 | ||
| 17802 | (defun org-timestamp-up (&optional arg) | 17802 | (defun org-timestamp-up (&optional arg) |
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index d991ccafc98..261e50a613f 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el | |||
| @@ -1004,7 +1004,7 @@ Do it only if `flymake-no-changes-timeout' is non-nil." | |||
| 1004 | (setq | 1004 | (setq |
| 1005 | flymake-timer | 1005 | flymake-timer |
| 1006 | (run-with-idle-timer | 1006 | (run-with-idle-timer |
| 1007 | (seconds-to-time flymake-no-changes-timeout) | 1007 | (encode-time flymake-no-changes-timeout) |
| 1008 | nil | 1008 | nil |
| 1009 | (lambda (buffer) | 1009 | (lambda (buffer) |
| 1010 | (when (buffer-live-p buffer) | 1010 | (when (buffer-live-p buffer) |
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))) |