ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix `org-toggle-tag' 

* lisp/org.el (org-toggle-tag): Fix weird behavior with inherited tags.

* testing/lisp/test-org.el (test-org/toggle-tag): Add test.

Reported-by: Bernt Hansen <bernt@norang.ca>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00537.html>
This commit is contained in:
Nicolas Goaziou 2018-04-28 02:04:06 +02:00
parent d48bff37ad
commit 031f362352
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org.el
View File

@ -14180,7 +14180,7 @@ If ONOFF is `on' or `off', don't toggle but set to this state."
(let ((current
;; Reverse the tags list so any new tag is appended to the
;; current list of tags.
(nreverse (org-get-tags)))
(nreverse (org-get-tags nil t)))
res)
(pcase onoff
(`off (setq current (delete tag current)))

70
testing/lisp/test-org.el
View File

@ -6280,6 +6280,76 @@ Paragraph<point>"
(let ((org-tags-column 1)) (org-set-tags-command t))
(buffer-string)))))
(ert-deftest test-org/toggle-tag ()
"Test `org-toggle-tag' specifications."
;; Insert missing tag.
(should
(equal "* H :tag:"
(org-test-with-temp-text "* H"
(let ((org-tags-column 1)) (org-toggle-tag "tag"))
(buffer-string))))
(should
(equal "* H :tag1:tag2:"
(org-test-with-temp-text "* H :tag1:"
(let ((org-tags-column 1)) (org-toggle-tag "tag2"))
(buffer-string))))
;; Remove existing tag.
(should
(equal "* H"
(org-test-with-temp-text "* H :tag:"
(org-toggle-tag "tag")
(buffer-string))))
(should
(equal "* H :tag1:"
(org-test-with-temp-text "* H :tag1:tag2:"
(let ((org-tags-column 1)) (org-toggle-tag "tag2"))
(buffer-string))))
(should
(equal "* H :tag2:"
(org-test-with-temp-text "* H :tag1:tag2:"
(let ((org-tags-column 1)) (org-toggle-tag "tag1"))
(buffer-string))))
;; With optional argument ONOFF set to `on', try to insert the tag,
;; even if its already there.
(should
(equal "* H :tag:"
(org-test-with-temp-text "* H"
(let ((org-tags-column 1)) (org-toggle-tag "tag" 'on))
(buffer-string))))
(should
(equal "* H :tag:"
(org-test-with-temp-text "* H :tag:"
(let ((org-tags-column 1)) (org-toggle-tag "tag" 'on))
(buffer-string))))
;; With optional argument ONOFF set to `off', try to remove the tag,
;; even if its not there.
(should
(equal "* H"
(org-test-with-temp-text "* H :tag:"
(org-toggle-tag "tag" 'off)
(buffer-string))))
(should
(equal "* H :tag:"
(org-test-with-temp-text "* H :tag:"
(let ((org-tags-column 1)) (org-toggle-tag "foo" 'off))
(buffer-string))))
;; Special case: Handle properly tag inheritance. In particular, do
;; not set inherited tags.
(should
(equal "* H1 :tag:\n** H2 :tag2:tag:"
(org-test-with-temp-text "* H1 :tag:\n** <point>H2 :tag2:"
(let ((org-use-tag-inheritance t)
(org-tags-column 1))
(org-toggle-tag "tag"))
(buffer-string))))
(should
(equal "* H1 :tag1:tag2:\n** H2 :foo:"
(org-test-with-temp-text "* H1 :tag1:tag2:\n** <point>H2"
(let ((org-use-tag-inheritance t)
(org-tags-column 1))
(org-toggle-tag "foo"))
(buffer-string)))))
;;; TODO keywords