Browse Source

Merge branch 'maint'

Conflicts:
	lisp/org-agenda.el
Bastien Guerry 5 years ago
parent
commit
b8104315d3
1 changed files with 9 additions and 2 deletions
  1. 9 2
      lisp/org-agenda.el

+ 9 - 2
lisp/org-agenda.el

@@ -5957,7 +5957,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
 	 (d1 (calendar-absolute-from-gregorian date)) ; DATE bound by calendar
 	 d2 diff dfrac wdays pos pos1 category category-pos level
 	 tags suppress-prewarning ee txt head face s todo-state
-	 show-all upcomingp donep timestr warntime)
+	 show-all upcomingp donep timestr warntime inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -6023,7 +6023,14 @@ See also the user option `org-agenda-clock-consistency-checks'."
 		  (goto-char (match-end 0))
 		  (setq pos1 (match-beginning 0))
 		  (setq level (make-string (org-reduced-level (org-outline-level)) ? ))
-		  (setq tags (org-get-tags-at pos1 t))
+		  (setq inherited-tags
+			(or (eq org-agenda-show-inherited-tags 'always)
+			    (and (listp org-agenda-show-inherited-tags)
+				 (memq 'agenda org-agenda-show-inherited-tags))
+			    (and (eq org-agenda-show-inherited-tags t)
+				 (or (eq org-agenda-use-tag-inheritance t)
+				     (memq 'agenda org-agenda-use-tag-inheritance))))
+			tags (org-get-tags-at pos1 (not inherited-tags)))
 		  (setq head (buffer-substring-no-properties
 			      (point)
 			      (progn (skip-chars-forward "^\r\n")