Merge from origin/emacs-29

d0147ff9e50 * lisp/emacs-lisp/shortdoc.el: More and better `substring...
fa06249a9fb Fix "C-x RET r" when the new encoding is UTF
679e9d7c56e ; Mention MinGW64 GCC 13.1 problems in PROBLEMS
fdc1a12ed1a Fix "vc-print-log does not erase buffer" and associated p...
d507aa7336b Add selector_expression indentation rule
1f664a0af75 Add "nixd" LSP server to Eglot
e962cf4ba72 Fix building --with-native-compilation=aot from release t...
4ca371e9cc7 Fix bug#64152 (Minibuffer sometimes goes "modal")
a0ccf1859cc Disable target-async by default in gdb-mi.el
2bad5829ff7 Revert "Fix parsing of dn line if WITHDN is non-nil"
7637e361d3b Don't truncate filenames with "emacs.el" in them
2591eb1190a Improve documentation of 'minibuffer-message'
6f211bc57b9 Eglot: again fix positions of coinciding inlay hint overl...
a24e9e3fee5 ; Update ChangeLog.4 and etc/AUTHORS.

1 files changed, 9 insertions, 4 deletions

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a93d85caedb..6c3094719ed 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1121,10 +1121,15 @@ possible values of STATE are explained in `vc-state', and MODEL in
 the returned list.
 
 BEWARE: this function may change the current buffer."
-  (with-current-buffer (or (buffer-base-buffer) (current-buffer))
-    (vc-deduce-fileset-1 not-state-changing
-                         allow-unregistered
-                         state-model-only-files)))
+  (let (new-buf res)
+    (with-current-buffer (or (buffer-base-buffer) (current-buffer))
+      (setq res
+            (vc-deduce-fileset-1 not-state-changing
+                                 allow-unregistered
+                                 state-model-only-files))
+      (setq new-buf (current-buffer)))
+    (set-buffer new-buf)
+    res))
 
 (defun vc-deduce-fileset-1 (not-state-changing
                             allow-unregistered