forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
39d22406e4
|
@ -18027,10 +18027,10 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
|
||||||
(inhibit-read-only t)
|
(inhibit-read-only t)
|
||||||
(org-inhibit-startup org-agenda-inhibit-startup)
|
(org-inhibit-startup org-agenda-inhibit-startup)
|
||||||
(rea (concat ":" org-archive-tag ":"))
|
(rea (concat ":" org-archive-tag ":"))
|
||||||
file re)
|
file re pos)
|
||||||
(setq org-tag-alist-for-agenda nil
|
(setq org-tag-alist-for-agenda nil
|
||||||
org-tag-groups-alist-for-agenda nil)
|
org-tag-groups-alist-for-agenda nil)
|
||||||
(save-excursion
|
(save-window-excursion
|
||||||
(save-restriction
|
(save-restriction
|
||||||
(while (setq file (pop files))
|
(while (setq file (pop files))
|
||||||
(catch 'nextfile
|
(catch 'nextfile
|
||||||
|
@ -18040,6 +18040,7 @@ 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)
|
||||||
|
(setq pos (point))
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(let ((case-fold-search t))
|
(let ((case-fold-search t))
|
||||||
(when (search-forward "#+setupfile" nil t)
|
(when (search-forward "#+setupfile" nil t)
|
||||||
|
@ -18081,7 +18082,8 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
|
||||||
org-comment-string))
|
org-comment-string))
|
||||||
(while (re-search-forward re nil t)
|
(while (re-search-forward re nil t)
|
||||||
(add-text-properties
|
(add-text-properties
|
||||||
(match-beginning 0) (org-end-of-subtree t) pc))))))))
|
(match-beginning 0) (org-end-of-subtree t) pc))))
|
||||||
|
(goto-char pos)))))
|
||||||
(setq org-todo-keywords-for-agenda
|
(setq org-todo-keywords-for-agenda
|
||||||
(org-uniquify org-todo-keywords-for-agenda))
|
(org-uniquify org-todo-keywords-for-agenda))
|
||||||
(setq org-todo-keyword-alist-for-agenda
|
(setq org-todo-keyword-alist-for-agenda
|
||||||
|
|
Loading…
Reference in a new issue