diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-14 18:05:15 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-14 18:05:15 +0100 |
commit | 626212af0e4b3313e3872b160c1684a12da4bfdf (patch) | |
tree | d9642aeae4ad81193f6aa455f6be18e07d222100 | |
parent | d06fa4fa16a4129f08a91f464a02383f08ded0d3 (diff) | |
parent | 115bd786954a20cffa3f10d1e0a68d5795fd7685 (diff) | |
download | org-mode-626212af0e4b3313e3872b160c1684a12da4bfdf.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 642f173..82b039b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4518,7 +4518,8 @@ in `org-agenda-text-search-extra-files'." category-pos (get-text-property (point) 'org-category-position) inherited-tags (or (eq org-agenda-show-inherited-tags 'always) - (memq 'todo org-agenda-show-inherited-tags) + (and (listp org-agenda-show-inherited-tags) + (memq 'todo org-agenda-show-inherited-tags)) (and (eq org-agenda-show-inherited-tags t) (or (eq org-agenda-use-tag-inheritance t) (memq 'todo org-agenda-use-tag-inheritance)))) |