summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-11-06 16:16:07 +0100
committerBastien Guerry <bzg@altern.org>2013-11-06 16:16:07 +0100
commit39d22406e486582796807a7398614ab2e80a8d74 (patch)
tree39c6c4da2ae72f46a8f52b46b45df632d6f84dce
parented38714b14861dc1cfa8f31ef74213679b631a45 (diff)
parentfe3379bda6ca23474639b114592958bf14431c88 (diff)
downloadorg-mode-39d22406e486582796807a7398614ab2e80a8d74.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 7c2a316..a700785 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18027,10 +18027,10 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
(inhibit-read-only t)
(org-inhibit-startup org-agenda-inhibit-startup)
(rea (concat ":" org-archive-tag ":"))
- file re)
+ file re pos)
(setq org-tag-alist-for-agenda nil
org-tag-groups-alist-for-agenda nil)
- (save-excursion
+ (save-window-excursion
(save-restriction
(while (setq file (pop files))
(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)))
(widen)
(org-set-regexps-and-options-for-tags)
+ (setq pos (point))
(goto-char (point-min))
(let ((case-fold-search 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))
(while (re-search-forward re nil t)
(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
(org-uniquify org-todo-keywords-for-agenda))
(setq org-todo-keyword-alist-for-agenda