[elpa] externals/org edc2e68: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit edc2e68e859ff9f9663658b95d4d3d3b2f2a68a0
Merge: 01d3e67 eecc057
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 lisp/org-agenda.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 24af37e..4c34ca5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8399,7 +8399,8 @@ When optional argument BACKWARD is set, go backward."
 With prefix ARG, go forward that many times the current span."
   (interactive "p")
   (org-agenda-check-type t 'agenda)
-  (let* ((args (get-text-property (min (1- (point-max)) (point)) 
'org-last-args))
+  (let* ((wstart (window-start))
+         (args (get-text-property (min (1- (point-max)) (point)) 
'org-last-args))
         (span (or (nth 2 args) org-agenda-current-span))
         (sd (or (nth 1 args) (org-get-at-bol 'day) org-starting-day))
         (greg (calendar-gregorian-from-absolute sd))
@@ -8433,7 +8434,7 @@ With prefix ARG, go forward that many times the current 
span."
           (list (car args) sd span)))
       (org-agenda-redo)
       (org-agenda-find-same-or-today-or-agenda cnt))
-    (set-window-start nil 1)))
+    (set-window-start nil wstart)))
 
 (defun org-agenda-earlier (arg)
   "Go backward in time by the current span.