mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-13 09:32:19 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Bastien Guerry 2013-07-04 22:11:57 +02:00
commit aab08b5e36
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -4909,13 +4909,13 @@ Support for group tags is controlled by the option
(setq ret (save-match-data
(org-set-regexps-and-options-for-tags)))))
;; Append setupfile tags to existing tags
(setq org-ota t)
(setq org-file-tags
(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
(delq nil (append org-tag-groups-alist (nth 2 ret)))
org-ota t)))
(delq nil (append org-tag-groups-alist (nth 2 ret))))))
(and ext-setup-or-nil
(string-match re ext-setup-or-nil start)
(setq start (match-end 0)))