From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] Allow org-agenda-entry-types to trump org-agenda-include-deadlines Date: Wed, 24 Mar 2010 12:08:23 +0100 Message-ID: References: <877hp2stao.fsf@fastmail.fm> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuORq-0007Ui-RJ for emacs-orgmode@gnu.org; Wed, 24 Mar 2010 07:08:30 -0400 Received: from [140.186.70.92] (port=60092 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuORp-0007UZ-AF for emacs-orgmode@gnu.org; Wed, 24 Mar 2010 07:08:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuORn-0004ZW-P3 for emacs-orgmode@gnu.org; Wed, 24 Mar 2010 07:08:29 -0400 Received: from fg-out-1718.google.com ([72.14.220.157]:63634) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuORn-0004ZO-GY for emacs-orgmode@gnu.org; Wed, 24 Mar 2010 07:08:27 -0400 Received: by fg-out-1718.google.com with SMTP id l26so986351fgb.12 for ; Wed, 24 Mar 2010 04:08:26 -0700 (PDT) In-Reply-To: <877hp2stao.fsf@fastmail.fm> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Matt Lundin Cc: Org Mode 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