; vc-setup-buffer: Don't pass a string to buffer-live-p.

(cherry picked from commit 2310c12658c4b563f9860cb1196bab0d56c6f94d)

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 00aea22d563fd43983d2625ef77e09ea6d10f45e..1b4831d0bd6e245266a03a5b508d6dfebe341a1b 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -177,8 +177,9 @@ Another is that undo information is not kept."
 (defun vc-setup-buffer (buf)
   "Prepare BUF for executing a slave command and make it current."
   (let ((camefrom (current-buffer))
-       (olddir default-directory))
-    (set-buffer (get-buffer-create buf))
+       (olddir default-directory)
+        (buf (get-buffer-create buf)))
+    (set-buffer buf)
     (let ((oldproc (get-buffer-process (current-buffer))))
       ;; If we wanted to wait for oldproc to finish before doing
       ;; something, we'd have used vc-eval-after.