summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Wahl <marcowahlsoft@gmail.com>2019-01-13 15:10:21 +0100
committerMarco Wahl <marcowahlsoft@gmail.com>2019-01-13 15:10:21 +0100
commit067c8dc6c461e42cd12e3c269c18fc02533ffc03 (patch)
treefee9aafec2126c1c8be0c359791e5b197fb8eeb1
parent6972cce38bb9b486bc3238d77c808d523b4c8900 (diff)
parent295d149f46303ec7dcf39dc29ca12b8ae0874f9c (diff)
downloadorg-mode-067c8dc6c461e42cd12e3c269c18fc02533ffc03.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 9607b12..b25a8e9 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7380,6 +7380,10 @@ With a prefix argument, do so in all agenda buffers."
(defvar org-agenda-filter-form nil)
(defvar org-agenda-filtered-by-category nil)
+(defsubst org-agenda-get-category ()
+ "Return the category of the agenda line."
+ (org-get-at-bol 'org-category))
+
(defun org-agenda-filter-by-category (strip)
"Filter lines in the agenda buffer that have a specific category.
The category is that of the current line.
@@ -7390,7 +7394,7 @@ With a prefix argument, exclude the lines of that category.
(if (and org-agenda-filtered-by-category
org-agenda-category-filter)
(org-agenda-filter-show-all-cat)
- (let ((cat (org-no-properties (org-get-at-eol 'org-category 1))))
+ (let ((cat (org-no-properties (org-agenda-get-category))))
(cond
((and cat strip)
(org-agenda-filter-apply
@@ -7725,7 +7729,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags."
(if (org-get-at-bol 'org-marker)
(progn
(setq tags (org-get-at-bol 'tags)
- cat (org-get-at-eol 'org-category 1)
+ cat (org-agenda-get-category)
txt (org-get-at-bol 'txt))
(unless (eval org-agenda-filter-form)
(org-agenda-filter-hide-line type))
@@ -8950,7 +8954,7 @@ If FORCE-TAGS is non nil, the car of it returns the new tags."
(equal m hdmarker))
(setq props (text-properties-at (point))
dotime (org-get-at-bol 'dotime)
- cat (org-get-at-eol 'org-category 1)
+ cat (org-agenda-get-category)
level (org-get-at-bol 'level)
tags thetags
new