ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace `time-to-seconds´ with `org-float-time´ 

* 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.
This commit is contained in:
Achim Gratz 2013-02-23 10:20:03 +01:00
parent ff064f89c2
commit 570e0f93dc
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 (< (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 ()