mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:07:54 +00:00
Merge branch 'maint'
This commit is contained in:
commit
2a9d8653eb
|
@ -5743,7 +5743,8 @@ then those holidays will be skipped."
|
||||||
(list
|
(list
|
||||||
(if (memq 'closed items) (concat "\\<" org-closed-string))
|
(if (memq 'closed items) (concat "\\<" org-closed-string))
|
||||||
(if (memq 'clock items) (concat "\\<" org-clock-string))
|
(if (memq 'clock items) (concat "\\<" org-clock-string))
|
||||||
(if (memq 'state items) "- State \"\\([a-zA-Z0-9]+\\)\".*?"))))
|
(if (memq 'state items)
|
||||||
|
(format "- State \"%s\".*?" org-todo-regexp)))))
|
||||||
(parts-re (if parts (mapconcat 'identity parts "\\|")
|
(parts-re (if parts (mapconcat 'identity parts "\\|")
|
||||||
(error "`org-agenda-log-mode-items' is empty")))
|
(error "`org-agenda-log-mode-items' is empty")))
|
||||||
(regexp (concat
|
(regexp (concat
|
||||||
|
|
Loading…
Reference in a new issue