From 16f5dd7f8e2eaafc6ac04e9e94db4cc226f6c90b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 10 Mar 2025 17:13:14 +0800 Subject: [PATCH] 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) --- lisp/vc/vc-dispatcher.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 38782d8a583..3f7c58cb2d4 100644 --- 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)) -- 2.39.5