aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorSean Whitton2026-02-28 21:16:49 +0000
committerSean Whitton2026-02-28 21:16:49 +0000
commitb7dedde7aa1d2765f09fbee54cf1cded29f40b86 (patch)
tree1a3a3a9cca4bf1c6e97c18da2d50d39eee8c1a90 /lisp/vc
parentd78a1db462806e17989043623aba17748d2af55f (diff)
downloademacs-master.tar.gz
emacs-master.zip
; Relocate comment along with the relocated code.HEADmaster
The code was moved, but without its comment, in this change: Author: Dmitry Gutov <dgutov@yandex.ru> AuthorDate: Thu May 28 02:16:00 2015 +0300 Delete the old process in vc-setup-buffer * lisp/vc/vc-dispatcher.el (vc-setup-buffer): Delete the old process here. (vc-do-command): Rather than here (bug#20608).
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc-dispatcher.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 9baf85bd5b2..13ee1101a3b 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -188,6 +188,7 @@ Another is that undo information is not kept."
188 (olddir default-directory) 188 (olddir default-directory)
189 (buf (get-buffer-create buf))) 189 (buf (get-buffer-create buf)))
190 (set-buffer buf) 190 (set-buffer buf)
191 ;; If there's some previous async process still running, just kill it.
191 (let ((oldproc (get-buffer-process (current-buffer)))) 192 (let ((oldproc (get-buffer-process (current-buffer))))
192 ;; If we wanted to wait for oldproc to finish before doing 193 ;; If we wanted to wait for oldproc to finish before doing
193 ;; something, we'd have used vc-eval-after. 194 ;; something, we'd have used vc-eval-after.
@@ -488,8 +489,6 @@ that is inserted into the command line before the filename."
488 (squeezed (remq nil flags)) 489 (squeezed (remq nil flags))
489 (inhibit-read-only t) 490 (inhibit-read-only t)
490 (status 0)) 491 (status 0))
491 ;; If there's some previous async process still running,
492 ;; just kill it.
493 (when files 492 (when files
494 (setq squeezed (nconc squeezed files))) 493 (setq squeezed (nconc squeezed files)))
495 (let (;; Since some functions need to parse the output 494 (let (;; Since some functions need to parse the output