mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2020-09-04 19:16:27 +02:00
parent 20aa3507af 39d9eb541f
commit ae0aec4959
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/org-agenda.el
View File

@ -7739,6 +7739,11 @@ the variable `org-agenda-auto-exclude-function'."
(fe (if keep org-agenda-effort-filter))
(fr (if keep org-agenda-regexp-filter))
pm s)
;; If the filter contains a double-quoted string, replace a
;; single hyphen by the arbitrary and temporary string "~~~"
;; to disambiguate such hyphens from syntactic ones.
(setq f-string (replace-regexp-in-string
"\"\\([^\"]*\\)-\\([^\"]*\\)\"" "\"\\1~~~\\2\"" f-string))
(while (string-match "^[ \t]*\\([-+]\\)?\\(\\([^-+<>=/ \t]+\\)\\|\\([<>=][0-9:]+\\)\\|\\(/\\([^/]+\\)/?\\)\\)" f-string)
(setq pm (if (match-beginning 1) (match-string 1 f-string) "+"))
(when negate
@ -7746,12 +7751,15 @@ the variable `org-agenda-auto-exclude-function'."
(cond
((match-beginning 3)
;; category or tag
(setq s (match-string 3 f-string))
(setq s (replace-regexp-in-string ; Remove the temporary special string.
"~~~" "-" (match-string 3 f-string)))
(cond
((member s tag-list)
(add-to-list 'ft (concat pm s) 'append 'equal))
((member s category-list)
(add-to-list 'fc (concat pm s) 'append 'equal))
(add-to-list 'fc (concat pm ; Remove temporary double quotes.
(replace-regexp-in-string "\"\\(.*\\)\"" "\\1" s))
'append 'equal))
(t (message
"`%s%s' filter ignored because tag/category is not represented"
pm s))))
@ -7924,7 +7932,10 @@ also press `-' or `+' to switch between filtering and excluding."
pos 'org-category nil (point-max))))
(push (get-text-property pos 'org-category) categories))
(setq org-agenda-represented-categories
(nreverse (org-uniquify (delq nil categories))))))))
;; Enclose category names with a hyphen in double
;; quotes to process them specially in `org-agenda-filter'.
(mapcar (lambda (s) (if (string-match-p "-" s) (format "\"%s\"" s) s))
(nreverse (org-uniquify (delq nil categories)))))))))
(defvar org-tag-groups-alist-for-agenda)
(defun org-agenda-get-represented-tags ()