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

[ELPA Syncer]

branch: externals/org
commit c3c89d569aede51985712bf32b84a4f9016226be
Merge: 7666d6b 8037464
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org.el | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1bd9e02..4fd8b6f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9165,24 +9165,26 @@ or to another Org file, automatically push the old 
position onto the ring."
 (defvar org-agenda-start-on-weekday)
 (defun org-follow-timestamp-link ()
   "Open an agenda view for the time-stamp date/range at point."
-  (cond
-   ((org-at-date-range-p t)
-    (let ((org-agenda-start-on-weekday)
-         (t1 (match-string 1))
-         (t2 (match-string 2)) tt1 tt2)
-      (setq tt1 (time-to-days (org-time-string-to-time t1))
-           tt2 (time-to-days (org-time-string-to-time t2)))
+  ;; Avoid changing the global value.
+  (let ((org-agenda-buffer-name org-agenda-buffer-name))
+    (cond
+     ((org-at-date-range-p t)
+      (let ((org-agenda-start-on-weekday)
+           (t1 (match-string 1))
+           (t2 (match-string 2)) tt1 tt2)
+       (setq tt1 (time-to-days (org-time-string-to-time t1))
+             tt2 (time-to-days (org-time-string-to-time t2)))
+       (let ((org-agenda-buffer-tmp-name
+              (format "*Org Agenda(a:%s)"
+                      (concat (substring t1 0 10) "--" (substring t2 0 10)))))
+         (org-agenda-list nil tt1 (1+ (- tt2 tt1))))))
+     ((org-at-timestamp-p 'lax)
       (let ((org-agenda-buffer-tmp-name
-            (format "*Org Agenda(a:%s)"
-                    (concat (substring t1 0 10) "--" (substring t2 0 10)))))
-       (org-agenda-list nil tt1 (1+ (- tt2 tt1))))))
-   ((org-at-timestamp-p 'lax)
-    (let ((org-agenda-buffer-tmp-name
-          (format "*Org Agenda(a:%s)" (substring (match-string 1) 0 10))))
-      (org-agenda-list nil (time-to-days (org-time-string-to-time
-                                         (substring (match-string 1) 0 10)))
-                      1)))
-   (t (error "This should not happen"))))
+            (format "*Org Agenda(a:%s)" (substring (match-string 1) 0 10))))
+       (org-agenda-list nil (time-to-days (org-time-string-to-time
+                                           (substring (match-string 1) 0 10)))
+                        1)))
+     (t (error "This should not happen")))))
 
 
 ;;; Following file links