From 8f62cd7bbe336ba0668afb72cbbbd8c46c15376a Mon Sep 17 00:00:00 2001 From: Jens Schmidt Date: Thu, 8 Jun 2023 23:46:33 +0200 Subject: [PATCH 4/5] Fix documentation bug and remove obsolete fixmes Function `vc-deduce-fileset' preserves current buffer since commit d494833d47968fcd97ba549654a259d6fb6c2eee. Change documentation accordingly. * lisp/vc/vc.el (vc-deduce-fileset): Change doc string. (vc-deduce-fileset-1): Remove now-obsolete fixme comment. (Bug#63949) --- lisp/vc/vc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1144a23f317..6b99eba9d3b 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1120,7 +1120,7 @@ vc-deduce-fileset `vc-checkout-model'. Otherwise, these 3 members may be omitted from the returned list. -BEWARE: this function may change the current buffer." +This function preserves the current buffer." (with-current-buffer (or (buffer-base-buffer) (current-buffer)) (vc-deduce-fileset-1 not-state-changing allow-unregistered @@ -1151,7 +1151,7 @@ vc-deduce-fileset-1 (or (derived-mode-p 'vc-dir-mode) (derived-mode-p 'dired-mode) (derived-mode-p 'diff-mode))))) - (progn ;FIXME: Why not `with-current-buffer'? --Stef. + (progn (set-buffer vc-parent-buffer) (vc-deduce-fileset-1 not-state-changing allow-unregistered state-model-only-files))) ((and (not buffer-file-name) -- 2.30.2