ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-01-16 15:59:05 +01:00
parent 4fe777fdae ce80a0e727
commit 791e52bfdd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org.el
View File

@ -18720,10 +18720,14 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
(append org-tag-alist-for-agenda (append org-tag-alist-for-agenda
org-tag-alist org-tag-alist
org-tag-persistent-alist))) org-tag-persistent-alist)))
;; Merge current file's tag groups into global
;; `org-tag-groups-alist-for-agenda'.
(when org-group-tags (when org-group-tags
(setq org-tag-groups-alist-for-agenda (dolist (alist org-tag-groups-alist)
(org-uniquify-alist (let ((old (assoc (car alist) org-tag-groups-alist-for-agenda)))
(append org-tag-groups-alist-for-agenda org-tag-groups-alist)))) (if old
(setcdr old (org-uniquify (append (cdr old) (cdr alist))))
(push alist org-tag-groups-alist-for-agenda)))))
(org-with-silent-modifications (org-with-silent-modifications
(save-excursion (save-excursion
(remove-text-properties (point-min) (point-max) pall) (remove-text-properties (point-min) (point-max) pall)