tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source 
Conflicts:
	lisp/org-agenda.el
This commit is contained in:
Bastien Guerry 2013-01-22 22:28:47 +01:00
parent 196c5797d2 62c3107eb2
commit b8104315d3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/org-agenda.el
View file

@ -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")