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

Merge commit 'johnw/master'

This commit is contained in:
Carsten Dominik 2009-11-05 08:19:14 +01:00
parent 3e84540bfa cec499dc6f
commit f013fa51df
2 changed files with 13 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-11-05 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Another fix to the
way the amount of idle time is presented in the minibuffer.
2009-11-05 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Use

14
lisp/org-clock.el
View File

@ -796,8 +796,10 @@ if the user really wants to stay clocked in after being idle for
so long."
(when (and org-clock-idle-time (not org-clock-resolving-clocks)
org-clock-marker)
(let ((org-clock-user-idle-start (current-time))
(org-clock-user-idle-seconds (org-user-idle-seconds))
(let ((org-clock-user-idle-seconds (org-user-idle-seconds))
(org-clock-user-idle-start
(time-subtract (current-time)
(seconds-to-time org-clock-user-idle-seconds)))
(org-clock-resolving-clocks-due-to-idleness t))
(if (> org-clock-user-idle-seconds (* 60 org-clock-idle-time))
(org-clock-resolve
@ -805,12 +807,12 @@ so long."
org-clock-start-time)
(function
(lambda (clock)
(format "Clocked in & idle for %d mins"
(format "Clocked in & idle for %.1f mins"
(/ (org-float-time
(time-subtract (current-time)
org-clock-user-idle-start)) 60))))
(time-subtract (current-time)
(seconds-to-time org-clock-user-idle-seconds)))))))
org-clock-user-idle-start))
60.0))))
org-clock-user-idle-start)))))
(defun org-clock-in (&optional select)
"Start the clock on the current item.