From 84f8332590875dbb0a4f45d626192eacdaf4b4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Thu, 7 Oct 2021 21:03:31 +0300 Subject: [PATCH 12/76] Deprecate org-agenda-top-headline-filter. --- lisp/org-agenda.el | 20 ++++++++++---------- lisp/org-compat.el | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index cc9afd1a8..d26b254a0 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2232,7 +2232,7 @@ When nil, `q' will kill the single agenda buffer." org-agenda-columns-active org-agenda-tag-filter org-agenda-category-filter - org-agenda-top-headline-filter + org-agenda-top-heading-filter org-agenda-regexp-filter org-agenda-effort-filter org-agenda-markers @@ -3748,7 +3748,7 @@ removed from the entry content. Currently only `planning' is allowed here." (defvar org-agenda-category-filter nil) (defvar org-agenda-regexp-filter nil) (defvar org-agenda-effort-filter nil) -(defvar org-agenda-top-headline-filter nil) +(defvar org-agenda-top-heading-filter nil) (defvar org-agenda-represented-categories nil "Cache for the list of all categories in the agenda.") @@ -3991,9 +3991,9 @@ agenda display, configure `org-agenda-finalize-hook'." (org-get-tags)))))))) (setq org-agenda-represented-tags nil org-agenda-represented-categories nil) - (when org-agenda-top-headline-filter + (when org-agenda-top-heading-filter (org-agenda-filter-top-heading-apply - org-agenda-top-headline-filter)) + org-agenda-top-heading-filter)) (when org-agenda-tag-filter (org-agenda-filter-apply org-agenda-tag-filter 'tag t)) (when (get 'org-agenda-tag-filter :preset-filter) @@ -7586,7 +7586,7 @@ in the agenda." (org-agenda-keep-modes t) (tag-filter org-agenda-tag-filter) (tag-preset (get 'org-agenda-tag-filter :preset-filter)) - (top-hl-filter org-agenda-top-headline-filter) + (top-hl-filter org-agenda-top-heading-filter) (cat-filter org-agenda-category-filter) (cat-preset (get 'org-agenda-category-filter :preset-filter)) (re-filter org-agenda-regexp-filter) @@ -7626,7 +7626,7 @@ in the agenda." org-agenda-category-filter cat-filter org-agenda-regexp-filter re-filter org-agenda-effort-filter effort-filter - org-agenda-top-headline-filter top-hl-filter) + org-agenda-top-heading-filter top-hl-filter) (message "Rebuilding agenda buffer...done") (put 'org-agenda-tag-filter :preset-filter tag-preset) (put 'org-agenda-category-filter :preset-filter cat-preset) @@ -7709,7 +7709,7 @@ all lines of the category at point." (if org-agenda-filtered-by-top-heading (progn (setq org-agenda-filtered-by-top-heading nil - org-agenda-top-headline-filter nil) + org-agenda-top-heading-filter nil) (org-agenda-filter-show-all-top-filter)) (let ((toph (org-find-top-headline (org-get-at-bol 'org-hd-marker)))) (if toph (org-agenda-filter-top-heading-apply toph strip) @@ -7950,7 +7950,7 @@ which see." (org-agenda-filter-show-all-cat)) (when org-agenda-regexp-filter (org-agenda-filter-show-all-re)) - (when org-agenda-top-headline-filter + (when org-agenda-top-heading-filter (org-agenda-filter-show-all-top-filter)) (when org-agenda-effort-filter (org-agenda-filter-show-all-effort)) @@ -8244,7 +8244,7 @@ grouptags." (beginning-of-line 2))) (when (get-char-property (point) 'invisible) (org-agenda-previous-line)) - (setq org-agenda-top-headline-filter heading + (setq org-agenda-top-heading-filter heading org-agenda-filtered-by-top-heading t)) (defun org-agenda-filter-hide-line (type) @@ -8681,7 +8681,7 @@ so that the date SD will be in that range." (if (or org-agenda-tag-filter org-agenda-category-filter org-agenda-regexp-filter - org-agenda-top-headline-filter) + org-agenda-top-heading-filter) (user-error "Can't show entry text in filtered views") (setq org-agenda-entry-text-mode (or (integerp arg) (not org-agenda-entry-text-mode))) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index c77c1f295..ad82dddba 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -332,6 +332,8 @@ Counting starts at 1." 'org-agenda-loop-over-headings-in-active-region "9.5") (define-obsolete-variable-alias 'org-agenda-search-headline-for-time 'org-agenda-search-heading-for-time "9.5") +(define-obsolete-variable-alias 'org-agenda-top-headline-filter + 'org-agenda-top-heading-filter "9.5") (defun org-in-fixed-width-region-p () "Non-nil if point in a fixed-width region." -- 2.33.0