diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-23 14:49:02 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-23 14:49:02 +0100 |
commit | dddd9fb4af58e1cc6760ee4a2d3b3408f2f25c0e (patch) | |
tree | ddf9b7c0ff10cfe1d31a8a9d764eacbacc948bbe | |
parent | 1e2b26b62a61c43717188b5089ddfbe8369885c6 (diff) | |
parent | 345cfbec2503040c89ebedd75d6e660fcb6be14e (diff) | |
download | org-mode-dddd9fb4af58e1cc6760ee4a2d3b3408f2f25c0e.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-clock.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 914f5ff..7079a41 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1241,7 +1241,7 @@ make this the default behavior.)" (setq org-clock-start-time (apply 'encode-time (org-parse-time-string (match-string 1)))) - (setq org-clock-effort (get-text-property (point) 'org-effort)) + (setq org-clock-effort (org-entry-get (point) org-effort-property)) (setq org-clock-total-time (org-clock-sum-current-item (org-clock-get-sum-start)))) ((eq org-clock-in-resume 'auto-restart) @@ -1261,7 +1261,7 @@ make this the default behavior.)" (beginning-of-line 1) (org-indent-line-to (- (org-get-indentation) 2))) (insert org-clock-string " ") - (setq org-clock-effort (get-text-property (point) 'org-effort)) + (setq org-clock-effort (org-entry-get (point) org-effort-property)) (setq org-clock-total-time (org-clock-sum-current-item (org-clock-get-sum-start))) (setq org-clock-start-time |