[PATCH] Allow org-agenda-entry-types to trump org-agenda-include-deadlines

[PATCH] Allow org-agenda-entry-types to trump org-agenda-include-deadlines

[Matt Lundin]

Hi Carsten,

Commit 3a3a1023486111ef4e986de9f22e94ea9c05d890 introduced a new
variable org-agenda-include-deadlines. In the commit,
org-agenda-include-deadlines is set always to override
org-agenda-entry-types (i.e., :deadline is automatically added to the
local org-agenda-entry-types whenever org-agenda-include-deadlines is
t). 

The patch below gives org-agenda-entry-types precedence over
org-agenda-include-deadlines. AFAICT, the patch will not interfere with
the behavior of org-agenda-toggle-deadlines, nor will it affect anyone
who does not explicitly configure org-agenda-entry-types. 

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 56c7256..5e057a7 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3281,8 +3281,7 @@ given in `org-agenda-start-on-weekday'."
 	(catch 'nextfile
 	  (org-check-agenda-file file)
 	  (let ((org-agenda-entry-types org-agenda-entry-types))
-	    (if org-agenda-include-deadlines
-		(add-to-list 'org-agenda-entry-types :deadline)
+	    (unless org-agenda-include-deadlines 
 	      (setq org-agenda-entry-types
 		    (delq :deadline org-agenda-entry-types)))
 	    (cond
--8<---------------cut here---------------end--------------->8---

Thanks,
Matt

Re: [PATCH] Allow org-agenda-entry-types to trump org-agenda-include-deadlines

[Carsten Dominik]

Yes, Matt, you are right, I did not oversee that Johns patch would  
conflict with our earlier one in this way.  Thanks for catching this,  
I have applied the fix.

- Carsten

On Mar 23, 2010, at 8:59 PM, Matt Lundin wrote:

> Hi Carsten,
>
> Commit 3a3a1023486111ef4e986de9f22e94ea9c05d890 introduced a new
> variable org-agenda-include-deadlines. In the commit,
> org-agenda-include-deadlines is set always to override
> org-agenda-entry-types (i.e., :deadline is automatically added to the
> local org-agenda-entry-types whenever org-agenda-include-deadlines is
> t).
>
> The patch below gives org-agenda-entry-types precedence over
> org-agenda-include-deadlines. AFAICT, the patch will not interfere  
> with
> the behavior of org-agenda-toggle-deadlines, nor will it affect anyone
> who does not explicitly configure org-agenda-entry-types.
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 56c7256..5e057a7 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -3281,8 +3281,7 @@ given in `org-agenda-start-on-weekday'."
> 	(catch 'nextfile
> 	  (org-check-agenda-file file)
> 	  (let ((org-agenda-entry-types org-agenda-entry-types))
> -	    (if org-agenda-include-deadlines
> -		(add-to-list 'org-agenda-entry-types :deadline)
> +	    (unless org-agenda-include-deadlines
> 	      (setq org-agenda-entry-types
> 		    (delq :deadline org-agenda-entry-types)))
> 	    (cond
> --8<---------------cut here---------------end--------------->8---
>
> Thanks,
> Matt
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten