From 570e0f93dc9e5034a0bb0c997a53254b7247083c Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 23 Feb 2013 10:20:03 +0100 Subject: [PATCH] =?UTF-8?q?Replace=20`time-to-seconds=C2=B4=20with=20`org-?= =?UTF-8?q?float-time=C2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org.el (org-current-time): Replace call to obsolete function `time-to-seconds´ with a call to compatibility function `org-float-time´. XEmacs 21.5 already has float-time, so we may not need a compatibility function here depending on what version of XEmacs introduced it and what is the earliest version that Org is supposed to still support. --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 9fe2acda9..894580f90 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5338,8 +5338,8 @@ the rounding returns a past time." (apply 'encode-time (append (list 0 (* r (floor (+ .5 (/ (float (nth 1 time)) r))))) (nthcdr 2 time)))) - (if (and past (< (time-to-seconds (time-subtract (current-time) res)) 0)) - (seconds-to-time (- (time-to-seconds res) (* r 60))) + (if (and past (< (org-float-time (time-subtract (current-time) res)) 0)) + (seconds-to-time (- (org-float-time res) (* r 60))) res)))) (defun org-today ()