From d7bbf362da92b9db5b766b355d76258d6fc1de72 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 6 Feb 2014 00:25:16 +0100 Subject: [PATCH 1/2] Revert "org.el (org-agenda-prepare-buffers): Restore the point position" This reverts commit fe3379bda6ca23474639b114592958bf14431c88. --- lisp/org.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index a28589c87..2d5819862 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18057,10 +18057,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 pos) + file re) (setq org-tag-alist-for-agenda nil org-tag-groups-alist-for-agenda nil) - (save-window-excursion + (save-excursion (save-restriction (while (setq file (pop files)) (catch 'nextfile @@ -18070,7 +18070,6 @@ 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) @@ -18114,8 +18113,7 @@ 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)))) - (goto-char pos))))) + (match-beginning 0) (org-end-of-subtree t) pc)))))))) (setq org-todo-keywords-for-agenda (org-uniquify org-todo-keywords-for-agenda)) (setq org-todo-keyword-alist-for-agenda From f4f3f140accee7c6b18eee806465e847b940e3d9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 6 Feb 2014 00:27:33 +0100 Subject: [PATCH 2/2] Partially reapply fe3379bda6ca23474639b114592958bf14431c88 * org.el (org-agenda-prepare-buffers): Use `save-excursion' instead of `save-window-excursion'. Thanks to Florian Beck for reporting this. --- lisp/org.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 2d5819862..b4f344217 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