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

org.el (org-set-regexps-and-options): Process tags from an external setup file 

* org.el (org-set-regexps-and-options): Process tags from an
external setup file.

Thanks to Marcel van der Boom for reporting this bug.
This commit is contained in:
Bastien Guerry 2013-04-05 09:19:02 +02:00
parent bf55024ce0
commit d307657b9d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org.el
View File

@ -4806,8 +4806,8 @@ Support for group tags is controlled by the option
(org-set-local 'org-file-tags nil) (org-set-local 'org-file-tags nil)
(let ((re (org-make-options-regexp '("FILETAGS" "TAGS"))) (let ((re (org-make-options-regexp '("FILETAGS" "TAGS")))
(splitre "[ \t]+") (splitre "[ \t]+")
tags ftags key value (start 0)
(start 0)) tags ftags key value)
(save-excursion (save-excursion
(save-restriction (save-restriction
(widen) (widen)
@ -4894,6 +4894,17 @@ Support for group tags is controlled by the option
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(while (or (and ext-setup-or-nil (while (or (and ext-setup-or-nil
(let (ret)
(with-temp-buffer
(insert ext-setup-or-nil)
(let ((major-mode 'org-mode))
(org-set-regexps-and-options-for-tags)
(setq ret (list org-file-tags org-tag-alist
org-tag-groups-alist))))
(setq org-file-tags (nth 0 ret)
org-tag-alist (nth 1 ret)
org-tag-groups-alist (nth 2 ret))))
(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)))
(and (setq ext-setup-or-nil nil start 0) (and (setq ext-setup-or-nil nil start 0)