summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-07-03 15:03:28 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-07-03 15:03:28 (GMT)
commit7046ad18eeffe5940a83cfa971b53808719f7711 (patch)
tree0adbdf1972b3a326785edcbe16eefe3a4bb18310
parent74974ab34b7cf31add28cdb3f6d9fce8009eda34 (diff)
parent19af726090b0239dfe1dc193ab19316af9324bbc (diff)
downloadorg-mode-7046ad18eeffe5940a83cfa971b53808719f7711.zip
org-mode-7046ad18eeffe5940a83cfa971b53808719f7711.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 8ce1220..2399823 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4804,7 +4804,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")))
@@ -4872,6 +4872,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)
@@ -4901,10 +4902,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
@@ -4913,7 +4915,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)))
@@ -5146,6 +5149,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)