[PATCH] Re: Bug: org-agenda-buffer-name wrongly persists [9.4.4 (release_9.4.4 @ /usr/local/share/emacs/28.0.50/lisp/org/)]

[Ingo Lohmar]

Here's a local-tested fix to the bug described previously.  The attached
patch does not change anything about the overall handling of the agenda
buffer names, it only fixes org-follow-timestamp-link to introduce a
let-binding similar to what the standard org-dispatcher does.

>From 2c0166449de2f4252435ecfea8a2d1287eafc04b Mon Sep 17 00:00:00 2001
From: Ingo Lohmar <ingo.lohmar@posteo.net>
Date: Sat, 19 Jun 2021 17:04:56 +0200
Subject: [PATCH] org.el (org-follow-timestamp-link): Do not set global agenda
 name

The tmp value for the agenda buffer name is used in `org-agenda-list'
to set `org-agenda-buffer-name'.  Wrap the call in a let-binding for
this symbol (like the agenda dispatcher does), since otherwise it
inadvertently sets the global value.
---
 lisp/org.el | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1bd9e02eb..4fd8b6fa6 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
-- 
2.30.2