summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-24 16:22:21 +0200
committerBastien Guerry <bzg@altern.org>2013-04-24 16:22:21 +0200
commit38051ce48179831bc971c83be04f59fe56d94e51 (patch)
tree8b8e637da63b15b895825b9b1116b97fddb5fbcc
parentfb6170ec9cc84045bdd58b748d6bae72ea82f23e (diff)
parent0e4a4c452e91971645a58851d7522322a9a83fd7 (diff)
downloadorg-mode-38051ce48179831bc971c83be04f59fe56d94e51.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d75f6c2..358b747 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17986,7 +17986,10 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
(setq org-drawers-for-agenda
(append org-drawers-for-agenda org-drawers))
(setq org-tag-alist-for-agenda
- (org-uniquify (append org-tag-alist-for-agenda org-tag-alist)))
+ (org-uniquify
+ (append org-tag-alist-for-agenda
+ org-tag-alist
+ org-tag-persistent-alist)))
(if org-group-tags
(setq org-tag-groups-alist-for-agenda
(org-uniquify-alist