From: Max Mikhanosha <max@openchat.com>
Date: Tue, 26 Mar 2013 10:54:53 +0000 (-0400)
Subject: Fix agenda generation error if agenda had time grid and agenda format
X-Git-Tag: release_8.0~3^2~279^2
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/9594249b4d5ceacfe96dc97c40f697de48cf50d3

Fix agenda generation error if agenda had time grid and agenda format
contain effort

* lisp/org-agenda.el (org-agenda-format-item): Ensure effort is "" when unset
---

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index b722657c5..72ff2a770 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)