diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-01-22 21:28:47 (GMT) |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-01-22 21:28:47 (GMT) |
| commit | b8104315d3abfdd385fa5c3d1900e08ffe30fa27 (patch) | |
| tree | dd0494737918ff1f970cbdb0c95e51b8d43f170f | |
| parent | 196c5797d20e13c122097d1e3d3adf0969c8e59b (diff) | |
| parent | 62c3107eb2dfa7a75fae13da151eafb7535b8ab6 (diff) | |
| download | org-mode-b8104315d3abfdd385fa5c3d1900e08ffe30fa27.zip org-mode-b8104315d3abfdd385fa5c3d1900e08ffe30fa27.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
| -rw-r--r-- | lisp/org-agenda.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 48f1dda..1d58b69 100644 --- a/lisp/org-agenda.el +++ b/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") |