From: Matt Lundin <mdl@imapmail.org>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Ensure org-get-tags includes all local tags
Date: Wed, 25 Jul 2018 07:57:54 -0500 [thread overview]
Message-ID: <87r2jrsca5.fsf@fastmail.fm> (raw)
In-Reply-To: <87d0x56prn.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Tue, 05 Jun 2018 20:40:12 +0200")
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
>> With commit fbe56f89f75a8979e0ba48001a822518df2c66fe, the function
>> org-get-tags incorrectly removes uninherited tags from the list of tags
>> it returns, *even if* they are local tags.
>>
>> Expected behavior: org-get-tags should always return local tags,
>> regardless of whether they are excluded from inheritance. The variable
>> org-tags-exclude-from-inheritance should only apply to tags in parent
>> heading or to file tags.
>>
>> Actual behavior: if a local tag is in org-tags-exclude-from-inheritance,
>> org-get-tags will not return it.
>>
>> I've attached a patch that fixes the issue.
>
> You're right. Thank you.
>
> Could you add a regression test for this and push the change?
>
Hi Nicolas,
Sorry for the delay. I finally had time to improve this fix (my first
fix caused another regression) and add a regression test. At the moment,
I don't have push rights to the Org Mode repo, so I'm attaching the
patch here.
Best,
Matt
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Ensure-that-org-get-tags-returns-all-local-tags.patch --]
[-- Type: text/x-patch, Size: 2451 bytes --]
From f3dc39236e8f3940c58ab4e48f629360028131e1 Mon Sep 17 00:00:00 2001
From: Matt Lundin <mdl@imapmail.org>
Date: Wed, 25 Jul 2018 07:48:10 -0500
Subject: [PATCH] Ensure that org-get-tags returns all local tags
* lisp/org.el: (org-get-tags) Create a clearer separation between
local and inherited tags in the function, so that
org-remove-uninherited tags is only run on inherited tags. This is
important to avoid destroying existing tags when adding new tags.
* testing/lisp/test-org.el: (test-org/get-tags) Add regression test
---
lisp/org.el | 15 ++++++++-------
testing/lisp/test-org.el | 7 +++++++
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 999575d05..94252489c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14722,14 +14722,15 @@ Inherited tags have the `inherited' text property."
(org-with-point-at (or pos (point))
(unless (org-before-first-heading-p)
(org-back-to-heading t)
- (let ((tags (org--get-local-tags)))
- (if (or local (not org-use-tag-inheritance)) tags
+ (let ((ltags (org--get-local-tags)) itags)
+ (if (or local (not org-use-tag-inheritance)) ltags
+ (setq itags org-file-tags)
(while (org-up-heading-safe)
- (setq tags (append (mapcar #'org-add-prop-inherited
- (org--get-local-tags))
- tags)))
- (org-remove-uninherited-tags
- (delete-dups (append org-file-tags tags)))))))))
+ (setq itags (append (mapcar #'org-add-prop-inherited
+ (org--get-local-tags))
+ itags)))
+ (delete-dups
+ (append (org-remove-uninherited-tags itags) ltags))))))))
(defun org-get-buffer-tags ()
"Get a table of all tags used in the buffer, for completion."
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index a6b283163..20164beb5 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -6190,6 +6190,13 @@ Paragraph<point>"
(equal '("foo")
(org-test-with-temp-text "* H1 :foo:\n* <point>H2 :bar:"
(org-get-tags 1))))
+ ;; Make sure tags excluded from inheritance are returned if local
+ (should
+ (equal '("foo")
+ (org-test-with-temp-text "* Test :foo:"
+ (let ((org-use-tag-inheritance t)
+ (org-tags-exclude-from-inheritance '("foo")))
+ (org-get-tags)))))
;; Pathological case: tagged headline with an empty body.
(should (org-test-with-temp-text "* :tag:" (org-get-tags))))
--
2.18.0
next prev parent reply other threads:[~2018-07-25 12:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 17:39 [PATCH] Ensure org-get-tags includes all local tags Matt Lundin
2018-06-05 18:40 ` Nicolas Goaziou
2018-07-25 12:57 ` Matt Lundin [this message]
2018-08-19 8:29 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r2jrsca5.fsf@fastmail.fm \
--to=mdl@imapmail.org \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).