tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint' into master

This commit is contained in:
Kyle Meyer 2020-09-28 00:05:44 -04:00
parent 4b6495c3ba 6676a97d27
commit 16f505db22
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -11703,7 +11703,7 @@ See also `org-scan-tags'."
(cons match0 `(lambda (todo tags-list level) ,matcher)))))
(defun org--tags-expand-group (group tag-groups expanded)
"Recursively Expand all tags in GROUP, according to TAG-GROUPS.
"Recursively expand all tags in GROUP, according to TAG-GROUPS.
TAG-GROUPS is the list of groups used for expansion. EXPANDED is
an accumulator used in recursive calls."
(dolist (tag group)
@ -11751,7 +11751,9 @@ When DOWNCASED is non-nil, expand downcased TAGS."
(if (not downcased) g
(mapcar (lambda (s) (mapcar #'downcase s)) g)))))
(cond
(single-as-list (org--tags-expand-group (list match) tag-groups nil))
(single-as-list (org--tags-expand-group
(list (if downcased (downcase match) match))
tag-groups nil))
(org-group-tags
(let* ((case-fold-search t)
(tag-syntax org-mode-syntax-table)

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

@ -7106,7 +7106,14 @@ Paragraph<point>"
(equal "{A+}"
(org-test-with-temp-text "#+TAGS: [ A : B C ]"
(org-mode-restart)
(let ((org-tag-alist-for-agenda nil)) (org-tags-expand "{A+}"))))))
(let ((org-tag-alist-for-agenda nil)) (org-tags-expand "{A+}")))))
;; Uppercase MATCH works with a non-nil DOWNCASED and SINGLE-AS-LIST.
(should
(equal (list "a" "b" "c")
(org-test-with-temp-text "#+TAGS: [ A : B C ]"
(org-mode-restart)
(let ((org-tag-alist-for-agenda nil))
(sort (org-tags-expand "A" t t) #'string-lessp))))))
;;; TODO keywords