From ff064f89c23c158049cc565fd3c1d11ac4f73753 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 23 Feb 2013 10:10:38 +0100 Subject: [PATCH] Reverting "Fix compiler warning." This reverts commit da22d29eb215d360fd0b71f1e0ebb54cb63ca9bb. --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index f7e17d072..9fe2acda9 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 (< (float-time (time-subtract (current-time) res)) 0)) - (float-time (- (time-to-seconds res) (* r 60))) + (if (and past (< (time-to-seconds (time-subtract (current-time) res)) 0)) + (seconds-to-time (- (time-to-seconds res) (* r 60))) res)))) (defun org-today ()