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

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2016-06-19 14:15:02 -04:00
parent 69552bd42f 792bb9b655
commit 160efb5129
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -15721,8 +15721,8 @@ When INCREMENT is non-nil, set the property to the next allowed value."
(org-completing-read "Effort: " allowed nil)))) (org-completing-read "Effort: " allowed nil))))
(t (t
(org-completing-read (org-completing-read
(concat "Effort " (if (and cur (string-match "\\S-" cur)) (concat "Effort" (and cur (string-match "\\S-" cur)
(concat "[" cur "]") "") (concat " [" cur "]"))
": ") ": ")
existing nil nil "" nil cur))))) existing nil nil "" nil cur)))))
(unless (equal (org-entry-get nil prop) val) (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 . identity)
(effort-minutes . org-duration-string-to-minutes)) (effort-minutes . org-duration-string-to-minutes))
val) 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)) (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)))