From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted]  org-get-tags-at: exclude filetags when local is t
Date: Mon,  2 May 2011 09:17:53 +0200 (CEST)
Message-ID: <20110502071753.9EFE94366F7@u016822.science.uva.nl>
References: <87zkn792zq.fsf@fastmail.fm>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:59748)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1QGnOM-0006qq-I5
	for emacs-orgmode@gnu.org; Mon, 02 May 2011 03:18:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1QGnOG-0008G8-31
	for emacs-orgmode@gnu.org; Mon, 02 May 2011 03:18:02 -0400
Received: from u016822.science.uva.nl ([146.50.39.34]:49359)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1QGnOF-0008Fi-S7
	for emacs-orgmode@gnu.org; Mon, 02 May 2011 03:17:56 -0400
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Patch 774 (http://patchwork.newartisans.com/patch/774/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87zkn792zq.fsf%40fastmail.fm%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O] org-get-tags-at: exclude filetags when local is t
> Date: Sat, 30 Apr 2011 20:19:54 -0000
> From: Matt Lundin <mdl@imapmail.org>
> X-Patchwork-Id: 774
> Message-Id: <87zkn792zq.fsf@fastmail.fm>
> To: Org Mode <emacs-orgmode@gnu.org>
> 
> * lisp/org.el (org-get-tags-at): Don't include filetags if local is t.
> 
> The function org-get-tags-at and the functions that called it were
> including inherited file tags even if the user requested only local
> tags. This patch fixes the behavior.
> 
> ---
> lisp/org.el |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org.el b/lisp/org.el
> index 61668ce..afcd4cb 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -12798,7 +12798,9 @@ ignore inherited ones."
>  		      (or (org-up-heading-safe) (error nil))
>  		      (setq parent t)))
>  		(error nil)))))
> -	(append (org-remove-uniherited-tags org-file-tags) tags)))))
> +	(if local 
> +	    tags
> +	  (append (org-remove-uniherited-tags org-file-tags) tags))))))
>  
>  (defun org-add-prop-inherited (s)
>    (add-text-properties 0 (length s) '(inherited t) s)
>