diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2016-06-19 14:15:02 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2016-06-19 14:18:10 -0400 |
| commit | 160efb512929cf3f4d5fbf2d7d6ec2ff642375cf (patch) | |
| tree | 854c76c35a6403268f697dc7849605fa144ff926 | |
| parent | 69552bd42f99236578f51abcccd201dec3855d39 (diff) | |
| parent | 792bb9b65504a70f3678409bba1a1c144b794a9d (diff) | |
| download | org-mode-160efb512929cf3f4d5fbf2d7d6ec2ff642375cf.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el index d3c7e34..639a9d1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15721,8 +15721,8 @@ When INCREMENT is non-nil, set the property to the next allowed value." (org-completing-read "Effort: " allowed nil)))) (t (org-completing-read - (concat "Effort " (if (and cur (string-match "\\S-" cur)) - (concat "[" cur "]") "") + (concat "Effort" (and cur (string-match "\\S-" cur) + (concat " [" cur "]")) ": ") existing nil nil "" nil cur))))) (unless (equal (org-entry-get nil prop) val) @@ -15731,7 +15731,7 @@ When INCREMENT is non-nil, set the property to the next allowed value." '((effort . identity) (effort-minutes . org-duration-string-to-minutes)) val) - (when (string= heading org-clock-current-task) + (when (string= heading (bound-and-true-p org-clock-current-task)) (setq org-clock-effort (get-text-property (point-at-bol) 'effort)) (org-clock-update-mode-line)) (message "%s is now %s" prop val))) |