forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
05847efd4a
|
@ -3073,7 +3073,6 @@ the global options and expect it to be applied to the entire view.")
|
||||||
|
|
||||||
(defun org-prepare-agenda (&optional name)
|
(defun org-prepare-agenda (&optional name)
|
||||||
(setq org-todo-keywords-for-agenda nil)
|
(setq org-todo-keywords-for-agenda nil)
|
||||||
(setq org-done-keywords-for-agenda nil)
|
|
||||||
(setq org-drawers-for-agenda nil)
|
(setq org-drawers-for-agenda nil)
|
||||||
(unless org-agenda-persistent-filter
|
(unless org-agenda-persistent-filter
|
||||||
(setq org-agenda-tag-filter nil
|
(setq org-agenda-tag-filter nil
|
||||||
|
@ -3092,6 +3091,7 @@ the global options and expect it to be applied to the entire view.")
|
||||||
(make-string (window-width) org-agenda-block-separator))
|
(make-string (window-width) org-agenda-block-separator))
|
||||||
"\n"))
|
"\n"))
|
||||||
(narrow-to-region (point) (point-max)))
|
(narrow-to-region (point) (point-max)))
|
||||||
|
(setq org-done-keywords-for-agenda nil)
|
||||||
(org-agenda-reset-markers)
|
(org-agenda-reset-markers)
|
||||||
(setq org-agenda-contributing-files nil)
|
(setq org-agenda-contributing-files nil)
|
||||||
(setq org-agenda-columns-active nil)
|
(setq org-agenda-columns-active nil)
|
||||||
|
|
|
@ -12785,7 +12785,7 @@ headlines matching this string."
|
||||||
" *\\(\\<\\("
|
" *\\(\\<\\("
|
||||||
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
|
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
|
||||||
(org-re
|
(org-re
|
||||||
"\\>\\)\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))
|
"\\>\\)\\)? +\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))
|
||||||
(props (list 'face 'default
|
(props (list 'face 'default
|
||||||
'done-face 'org-agenda-done
|
'done-face 'org-agenda-done
|
||||||
'undone-face 'default
|
'undone-face 'default
|
||||||
|
|
Loading…
Reference in a new issue