summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-02-06 00:27:33 +0100
committerBastien Guerry <bzg@altern.org>2014-02-06 00:27:33 +0100
commitf4f3f140accee7c6b18eee806465e847b940e3d9 (patch)
treed626f54b77bb7d871246d15da97255d661132ffe
parentd7bbf362da92b9db5b766b355d76258d6fc1de72 (diff)
downloadorg-mode-f4f3f140accee7c6b18eee806465e847b940e3d9.tar.gz
Partially reapply fe3379bda6ca23474639b114592958bf14431c88
* org.el (org-agenda-prepare-buffers): Use `save-excursion' instead of `save-window-excursion'. Thanks to Florian Beck for reporting this.
-rw-r--r--lisp/org.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2d58198..b4f3442 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18057,7 +18057,7 @@ 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
@@ -18070,6 +18070,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)
@@ -18113,7 +18114,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