tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Reverting "Fix compiler warning." 

This reverts commit da22d29eb2.
This commit is contained in:
Achim Gratz 2013-02-23 10:10:38 +01:00
parent 3e95e859cd
commit ff064f89c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -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 ()