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 10:33:42 +02:00
parent 15baadd8af b83c0309a7
commit ab3f45cece
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/org.el
View File

@ -4873,7 +4873,9 @@ Support for group tags is controlled by the option
(while (setq e (pop tgs)) (while (setq e (pop tgs))
(or (and (stringp (car e)) (or (and (stringp (car e))
(assoc (car e) org-tag-alist)) (assoc (car e) org-tag-alist))
(push e org-tag-alist)))))))) (push e org-tag-alist)))
;; Return a list with tag variables
(list org-file-tags org-tag-alist org-tag-groups-alist))))))
(defun org-set-regexps-and-options () (defun org-set-regexps-and-options ()
"Precompute regular expressions used in the current buffer." "Precompute regular expressions used in the current buffer."
@ -4901,17 +4903,20 @@ Support for group tags is controlled by the option
(save-restriction (save-restriction
(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) (let (ret)
(with-temp-buffer (with-temp-buffer
(insert ext-setup-or-nil) (insert ext-setup-or-nil)
(let ((major-mode 'org-mode)) (let ((major-mode 'org-mode))
(org-set-regexps-and-options-for-tags) (setq ret (save-match-data
(setq ret (list org-file-tags org-tag-alist (org-set-regexps-and-options-for-tags)))))
org-tag-groups-alist)))) ;; Append setupfile tags to existing tags
(setq org-file-tags (nth 0 ret) (setq org-file-tags (append org-file-tags (nth 0 ret))
org-tag-alist (nth 1 ret) org-tag-alist (append org-tag-alist (nth 1 ret))
org-tag-groups-alist (nth 2 ret)))) org-tag-groups-alist
(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)))
@ -18008,6 +18013,13 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
(set-buffer (org-get-agenda-file-buffer file))) (set-buffer (org-get-agenda-file-buffer file)))
(widen) (widen)
(org-set-regexps-and-options-for-tags) (org-set-regexps-and-options-for-tags)
(goto-char (point-min))
(let ((case-fold-search t))
(when (search-forward "#+setupfile" nil t)
;; Don't set all regexps and options systematically as
;; this is only run for setting agenda tags from setup
;; file
(org-set-regexps-and-options)))
(org-refresh-category-properties) (org-refresh-category-properties)
(org-refresh-properties org-effort-property 'org-effort) (org-refresh-properties org-effort-property 'org-effort)
(org-refresh-properties "APPT_WARNTIME" 'org-appt-warntime) (org-refresh-properties "APPT_WARNTIME" 'org-appt-warntime)