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

Use `org-float-time' instead of `time-to-seconds' in John's patch

This commit is contained in:
Carsten Dominik 2009-10-17 17:55:59 +02:00
parent dd01f724a6
commit a45e7d88c7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-17 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve, org-resolve-clocks)
(org-emacs-idle-seconds): Use `org-float-time' instead of
`time-to-seconds'
2009-10-17 Carsten Dominik <carsten.dominik@gmail.com>

12
lisp/org-clock.el
View File

@ -681,13 +681,13 @@ was started."
" [(kK)eep (sS)ubtract (C)ancel]? ")
nil 45)))
char-pressed))))
(default (floor (/ (time-to-seconds
(default (floor (/ (org-float-time
(time-subtract (current-time) last-valid)) 60)))
(keep (and (memq ch '(?k ?K))
(read-number "Keep how many minutes? " default)))
(subtractp (memq ch '(?s ?S)))
(barely-started-p (< (- (time-to-seconds last-valid)
(time-to-seconds (cdr clock))) 45))
(barely-started-p (< (- (org-float-time last-valid)
(org-float-time (cdr clock))) 45))
(start-over (and subtractp barely-started-p)))
(if (or (null ch)
(not (memq ch '(?k ?K ?s ?S ?C))))
@ -734,8 +734,8 @@ non-dangling (i.e., currently open and valid) clocks."
(format
"Dangling clock started %d mins ago"
(floor
(/ (- (time-to-seconds (current-time))
(time-to-seconds (cdr clock))) 60))))))
(/ (- (org-float-time (current-time))
(org-float-time (cdr clock))) 60))))))
(or last-valid
(cdr clock)))))))))))
@ -743,7 +743,7 @@ non-dangling (i.e., currently open and valid) clocks."
"Return the current Emacs idle time in seconds, or nil if not idle."
(let ((idle-time (current-idle-time)))
(if idle-time
(time-to-seconds idle-time)
(org-float-time idle-time)
0)))
(defun org-mac-idle-seconds ()