org-agenda.el (org-agenda-get-deadlines): Fix bug: use `org-agenda-show-inherited...
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 21:27:56 +0000 (22:27 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 21:27:56 +0000 (22:27 +0100)
* org-agenda.el (org-agenda-get-deadlines): Fix bug: use
`org-agenda-show-inherited-tags'.

Thanks to Kiwon Um for reporting this.

lisp/org-agenda.el

index f3540df..f088e59 100644 (file)
@@ -5892,7 +5892,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
         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)
@@ -5944,7 +5944,14 @@ See also the user option `org-agenda-clock-consistency-checks'."
                    (setq txt org-agenda-no-heading-message)
                  (goto-char (match-end 0))
                  (setq pos1 (match-beginning 0))
-                 (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")