Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-06-22 22:43:19 +02:00
commit 24852ef060
1 changed files with 1 additions and 1 deletions

View File

@ -15733,7 +15733,7 @@ When INCREMENT is non-nil, set the property to the next allowed value."
'((effort . identity) '((effort . identity)
(effort-minutes . org-duration-string-to-minutes)) (effort-minutes . org-duration-string-to-minutes))
val) val)
(when (string= heading (bound-and-true-p org-clock-current-task)) (when (equal heading (bound-and-true-p org-clock-current-task))
(setq org-clock-effort (get-text-property (point-at-bol) 'effort)) (setq org-clock-effort (get-text-property (point-at-bol) 'effort))
(org-clock-update-mode-line)) (org-clock-update-mode-line))
(message "%s is now %s" prop val))) (message "%s is now %s" prop val)))