summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-03-26 16:00:56 +0100
committerBastien Guerry <bzg@altern.org>2013-03-26 16:00:56 +0100
commitaa7b1e0b397859438f64889510a39293f10bcdf0 (patch)
tree99b5c644e24ec229c3810f62ec02e443894eba52
parent4184699910809b534fa7a58ac79cda3ac6237383 (diff)
parent9594249b4d5ceacfe96dc97c40f697de48cf50d3 (diff)
downloadorg-mode-aa7b1e0b397859438f64889510a39293f10bcdf0.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-agenda.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index b722657..72ff2a7 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6493,12 +6493,15 @@ Any match of REMOVE-RE will be removed from TXT."
(match-string 2 txt))
t t txt))))
(when (derived-mode-p 'org-mode)
- (setq effort (ignore-errors (get-text-property 0 'org-effort txt)))
- (if effort
- (setq neffort (org-duration-string-to-minutes effort)
- effort (setq effort (concat "[" effort "]")))
- ;; prevent erroring out with %e format when there is no effort
- (setq effort "")))
+ (setq effort (ignore-errors (get-text-property 0 'org-effort txt))))
+
+ ;; org-agenda-add-time-grid-maybe calls us with *Agenda* as
+ ;; current buffer, so move this check outside of above
+ (if effort
+ (setq neffort (org-duration-string-to-minutes effort)
+ effort (setq effort (concat "[" effort "]")))
+ ;; prevent erroring out with %e format when there is no effort
+ (setq effort ""))
(when remove-re
(while (string-match remove-re txt)