From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Lundin <mdl@imapmail.org>
Subject: [PATCH] Allow org-agenda-entry-types to trump
 org-agenda-include-deadlines
Date: Tue, 23 Mar 2010 15:59:43 -0400
Message-ID: <877hp2stao.fsf@fastmail.fm>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NuAFr-0006zF-Sm
	for emacs-orgmode@gnu.org; Tue, 23 Mar 2010 15:59:12 -0400
Received: from [140.186.70.92] (port=44266 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NuAFq-0006yD-Kx
	for emacs-orgmode@gnu.org; Tue, 23 Mar 2010 15:59:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <lundin@fastmail.fm>) id 1NuAFo-0008SF-2n
	for emacs-orgmode@gnu.org; Tue, 23 Mar 2010 15:59:10 -0400
Received: from out2.smtp.messagingengine.com ([66.111.4.26]:50490)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <lundin@fastmail.fm>) id 1NuAFo-0008S1-0h
	for emacs-orgmode@gnu.org; Tue, 23 Mar 2010 15:59:08 -0400
Received: from archdesk (adsl-99-181-148-248.dsl.klmzmi.sbcglobal.net
	[99.181.148.248])
	by mail.messagingengine.com (Postfix) with ESMTPSA id E03444BAB12
	for <emacs-orgmode@gnu.org>; Tue, 23 Mar 2010 15:59:06 -0400 (EDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Org Mode <emacs-orgmode@gnu.org>

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