Merge branch 'maint'

Conflicts:
	lisp/org-agenda.el

diff --cc lisp/org-agenda.el
index 48f1dda,f088e59..1d58b69
--- 1/lisp/org-agenda.el
--- 2/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@@ -5954,14 -5889,24 +5954,14 @@@ See also the user option `org-agenda-cl
                              (abbreviate-file-name buffer-file-name))))
         (regexp org-deadline-time-regexp)
         (todayp (org-agenda-todayp date)) ; DATE bound by calendar
 -       (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
 -       d2 diff dfrac wdays pos pos1 category category-pos
 +       (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)
 -      (setq suppress-prewarning nil)
        (catch :skip
        (org-agenda-skip)
 -      (when (and org-agenda-skip-deadline-prewarning-if-scheduled
 -                 (save-match-data
 -                   (string-match org-scheduled-time-regexp
 -                                 (buffer-substring (point-at-bol)
 -                                                   (point-at-eol)))))
 -        (setq suppress-prewarning
 -              (if (integerp org-agenda-skip-deadline-prewarning-if-scheduled)
 -                  org-agenda-skip-deadline-prewarning-if-scheduled
 -                0)))
        (setq s (match-string 1)
              txt nil
              pos (1- (match-beginning 1))
@@@ -6022,8 -5944,14 +6022,15 @@@
                    (setq txt org-agenda-no-heading-message)
                  (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")