diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-22 22:36:22 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-22 22:36:22 +0200 |
| commit | 2be2a15566782fad60d441582913a1f687b8b74d (patch) | |
| tree | afbcaafb4b57f7571e94d9e3b3bf8d1caf51b64a | |
| parent | 85dd02b0ddab7299fb05c452ee95bd0cd0206503 (diff) | |
| parent | 792bb9b65504a70f3678409bba1a1c144b794a9d (diff) | |
| download | org-mode-2be2a15566782fad60d441582913a1f687b8b74d.tar.gz | |
Merge branch 'maint' of orgmode.org:org-mode into 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 2508cee..0865bbb 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15701,8 +15701,8 @@ When INCREMENT is non-nil, set the property to the next allowed value." (t (let (org-completion-use-ido org-completion-use-iswitchb) (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) @@ -15711,7 +15711,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 (org-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))) |