tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Fix wrong setting of `org-tag-alist' with #+setupfile:. 

* org.el (org-set-regexps-and-options-for-tags): Enhance
docstring.
(org-set-regexps-and-options): Make sure not to add
`org-tag-alist' twice when setting this variable through et
#+setupfile: directive.

Thanks to Anupam Sengupta for reporting this.
This commit is contained in:
Bastien Guerry 2013-07-03 17:03:08 +02:00
parent f0c2a68056
commit 19af726090
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

@ -4802,7 +4802,7 @@ Support for group tags is controlled by the option
(if org-group-tags "on" "off")))
(defun org-set-regexps-and-options-for-tags ()
"Precompute regular expressions used for tags in the current buffer."
"Precompute variables used for tags."
(when (derived-mode-p 'org-mode)
(org-set-local 'org-file-tags nil)
(let ((re (org-make-options-regexp '("FILETAGS" "TAGS")))
@ -4870,6 +4870,7 @@ Support for group tags is controlled by the option
;; Return a list with tag variables
(list org-file-tags org-tag-alist org-tag-groups-alist))))))
(defvar org-ota nil)
(defun org-set-regexps-and-options ()
"Precompute regular expressions used in the current buffer."
(when (derived-mode-p 'org-mode)
@ -4899,10 +4900,11 @@ Support for group tags is controlled by the option
(while
(or (and
ext-setup-or-nil
(not org-ota)
(let (ret)
(with-temp-buffer
(insert ext-setup-or-nil)
(let ((major-mode 'org-mode))
(let ((major-mode 'org-mode) org-ota)
(setq ret (save-match-data
(org-set-regexps-and-options-for-tags)))))
;; Append setupfile tags to existing tags
@ -4911,7 +4913,8 @@ Support for group tags is controlled by the option
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))))))
(delq nil (append org-tag-groups-alist (nth 2 ret)))
org-ota t)))
(and ext-setup-or-nil
(string-match re ext-setup-or-nil start)
(setq start (match-end 0)))
@ -5144,6 +5147,7 @@ Support for group tags is controlled by the option
(mapcar (lambda (w) (substring w 0 -1))
(list org-scheduled-string org-deadline-string
org-clock-string org-closed-string)))
(setq org-ota nil)
(org-compute-latex-and-related-regexp))))
(defun org-file-contents (file &optional noerror)