summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 13:30:44 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-08 13:30:44 (GMT)
commit1e38a8162c0eb400760b12bcc7667bf19c20c01a (patch)
treeb52c8d9af1e72b74d7e6d808e42ef6ab8a1d23a1
parent6c3ef6226625156066ae7f9dc0d41fbd499f6ae2 (diff)
parent05f5f726fbee9aaaccca99e6d446cf265f1d5b80 (diff)
downloadorg-mode-1e38a8162c0eb400760b12bcc7667bf19c20c01a.zip
org-mode-1e38a8162c0eb400760b12bcc7667bf19c20c01a.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index acd3f46..8097c25 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3566,8 +3566,7 @@ generating a new one."
(while (org-activate-plain-links (point-max))
(add-text-properties (match-beginning 0) (match-end 0)
'(face org-link))))
- (when (cadr (assoc 'org-prefix-has-tag
- (car org-prefix-format-compiled)))
+ (unless (eq org-agenda-remove-tags t)
(org-agenda-align-tags))
(unless org-agenda-with-colors
(remove-text-properties (point-min) (point-max) '(face nil))))