summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-22 21:27:56 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-22 21:27:56 (GMT)
commit62c3107eb2dfa7a75fae13da151eafb7535b8ab6 (patch)
treeb6e219818f524d1d0ba509cc736c6aa9057bf137
parent211b137ef46d04b17b46f256696eb5c1c3a1d2be (diff)
downloadorg-mode-62c3107eb2dfa7a75fae13da151eafb7535b8ab6.zip
org-mode-62c3107eb2dfa7a75fae13da151eafb7535b8ab6.tar.gz
org-agenda.el (org-agenda-get-deadlines): Fix bug: use `org-agenda-show-inherited-tags'
* org-agenda.el (org-agenda-get-deadlines): Fix bug: use `org-agenda-show-inherited-tags'. Thanks to Kiwon Um for reporting this.
-rw-r--r--lisp/org-agenda.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f3540df..f088e59 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -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")