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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-03-06 10:15:22 +01:00
parent f7b120e566 9449939ca0
commit 5ad085f34c
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/org-clock.el
View File

@ -667,22 +667,21 @@ If an effort estimate was defined for the current item, use
01:30/01:50 format (clocked/estimated). 01:30/01:50 format (clocked/estimated).
If not, show simply the clocked time like 01:50." If not, show simply the clocked time like 01:50."
(let ((clocked-time (org-clock-get-clocked-time))) (let ((clocked-time (org-clock-get-clocked-time)))
(propertize (if org-clock-effort
(if org-clock-effort (let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort))
(let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort)) (work-done-str
(work-done-str (propertize (org-duration-from-minutes clocked-time)
(propertize (org-duration-from-minutes clocked-time) 'face
'face (if (and org-clock-task-overrun
(if (and org-clock-task-overrun (not org-clock-task-overrun-text))
(not org-clock-task-overrun-text)) 'org-mode-line-clock-overrun
'org-mode-line-clock-overrun 'org-mode-line-clock)))
'org-mode-line-clock))) (effort-str (org-duration-from-minutes effort-in-minutes)))
(effort-str (org-duration-from-minutes effort-in-minutes))) (format (propertize " [%s/%s] (%s)" 'face 'org-mode-line-clock)
(format " [%s/%s] (%s)" work-done-str effort-str org-clock-heading)) work-done-str effort-str org-clock-heading))
(format " [%s] (%s)" (format (propertize " [%s] (%s)" 'face 'org-mode-line-clock)
(org-duration-from-minutes clocked-time) (org-duration-from-minutes clocked-time)
org-clock-heading)) org-clock-heading))))
'face 'org-mode-line-clock)))
(defun org-clock-get-last-clock-out-time () (defun org-clock-get-last-clock-out-time ()
"Get the last clock-out time for the current subtree." "Get the last clock-out time for the current subtree."