vc-setup-buffer: Don't set current buffer as parent (bug#59457)

* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Don't set the
current buffer as parent (bug#59457).

(cherry picked from commit 6d62a293aff9af73d5f53ba0c7f226f29c6e35a2)

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 38782d8a5839de5a599863752011d9c66304ed55..3f7c58cb2d4a83c0205fb55ad0afebe8b7e8fd24 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -189,9 +189,12 @@ Another is that undo information is not kept."
     ;; Kill also this permanent local var in case the VC command that
     ;; created BUF was invoked from a different directory (bug#44698).
     (kill-local-variable 'file-local-variables-alist)
-    (setq-local vc-parent-buffer camefrom)
-    (setq-local vc-parent-buffer-name
-                (concat " from " (buffer-name camefrom)))
+    ;; If we are refreshing an existing view,
+    ;; don't throw away where we really came from (bug#59457).
+    (unless (eq camefrom (current-buffer))
+      (setq-local vc-parent-buffer camefrom)
+      (setq-local vc-parent-buffer-name
+                  (concat " from " (buffer-name camefrom))))
     (setq default-directory olddir)
     (let ((buffer-undo-list t)
           (inhibit-read-only t))