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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-05-16 17:07:32 +02:00
parent ab3f45cece 37d526e06e
commit 3ce5b3bb22
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -4913,10 +4913,12 @@ Support for group tags is controlled by the option
(setq ret (save-match-data (setq ret (save-match-data
(org-set-regexps-and-options-for-tags))))) (org-set-regexps-and-options-for-tags)))))
;; Append setupfile tags to existing tags ;; Append setupfile tags to existing tags
(setq org-file-tags (append org-file-tags (nth 0 ret)) (setq org-file-tags
org-tag-alist (append org-tag-alist (nth 1 ret)) (delq nil (append org-file-tags (nth 0 ret)))
org-tag-alist
(delq nil (append org-tag-alist (nth 1 ret)))
org-tag-groups-alist org-tag-groups-alist
(append org-tag-groups-alist (nth 2 ret))))) (delq nil (append org-tag-groups-alist (nth 2 ret))))))
(and ext-setup-or-nil (and ext-setup-or-nil
(string-match re ext-setup-or-nil start) (string-match re ext-setup-or-nil start)
(setq start (match-end 0))) (setq start (match-end 0)))