summaryrefslogtreecommitdiff
path: root/lisp/vc.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-09-24 01:08:40 +0000
committerRichard M. Stallman <rms@gnu.org>1994-09-24 01:08:40 +0000
commit06df6c79c564afa872aa59c5da887811c76a65b5 (patch)
tree0e646db036f22ecb850034e12ae63edf10d3abcb /lisp/vc.el
parentcc4698b12d5b06211ea05ab4d09a370af2001930 (diff)
downloademacs-06df6c79c564afa872aa59c5da887811c76a65b5.tar.gz
(vc-finish-steal): Do vc-resynch-window in the right buffer.
(vc-steal-lock): Delete spurious reference to `configuration'.
Diffstat (limited to 'lisp/vc.el')
-rw-r--r--lisp/vc.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 77101d1615d..7d6f0212fa1 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -599,7 +599,7 @@ level to check it in under. COMMENT, if specified, is the checkin comment."
(mail-mode)
(erase-buffer)
(mail-setup owner (format "Stolen lock on %s" file-description) nil nil nil
- (list (list 'vc-finish-steal file rev configuration)))
+ (list (list 'vc-finish-steal file rev)))
(goto-char (point-max))
(insert
(format "I stole the lock on %s, " file-description)
@@ -610,7 +610,10 @@ level to check it in under. COMMENT, if specified, is the checkin comment."
;; This is called when the notification has been sent.
(defun vc-finish-steal (file version)
(vc-backend-steal file version)
- (vc-resynch-window file t t))
+ (if (get-file-buffer file)
+ (save-excursion
+ (set-buffer (get-buffer-file file))
+ (vc-resynch-window file t t))))
(defun vc-checkin (file &optional rev comment)
"Check in the file specified by FILE.