diff options
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/cal-dst.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/icalendar.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/time-date.el | 6 | ||||
| -rw-r--r-- | lisp/calendar/timeclock.el | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 510cd6808e4..2d3b1f8c818 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -127,7 +127,7 @@ after midnight UTC on absolute date ABS-DATE." "Return the time of the next time zone transition after TIME. Both TIME and the result are acceptable arguments to `current-time-zone'. Return nil if no such transition can be found." - (let* ((time (encode-time time 'integer)) + (let* ((time (time-convert time 'integer)) (time-zone (current-time-zone time)) (time-utc-diff (car time-zone)) hi diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index cf3315b45db..c2688705e30 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -646,7 +646,7 @@ FIXME: multiple comma-separated values should be allowed!" (let ((decoded-time (list second minute hour day month year nil -1 zone))) (condition-case nil - (decode-time (encode-time decoded-time 'integer)) + (decode-time (encode-time decoded-time)) (error (message "Cannot decode \"%s\"" isodatetimestring) ;; Hope for the best.... diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index c0565b3cfb7..7505332011b 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -171,14 +171,14 @@ If DATE lacks timezone information, GMT is assumed." (defalias 'time-to-seconds 'float-time) ;;;###autoload -(defalias 'seconds-to-time 'encode-time) +(defalias 'seconds-to-time 'time-convert) ;;;###autoload (defun days-to-time (days) "Convert DAYS into a time value." - (let ((time (encode-time (* 86400 days)))) + (let ((time (time-convert (* 86400 days)))) ;; Traditionally, this returned a two-element list if DAYS was an integer. - ;; Keep that tradition if encode-time outputs timestamps in list form. + ;; Keep that tradition if time-convert outputs timestamps in list form. (if (and (integerp days) (consp (cdr time))) (setcdr (cdr time) nil)) time)) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 60586e7aced..ee7cf17b042 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -515,7 +515,7 @@ non-nil, the amount returned will be relative to past time worked." string))) (define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "26.1") -(define-obsolete-function-alias 'timeclock-seconds-to-time 'encode-time "26.1") +(define-obsolete-function-alias 'timeclock-seconds-to-time 'time-convert "26.1") ;; Should today-only be removed in favor of timeclock-relative? - gm (defsubst timeclock-when-to-leave (&optional today-only) |