aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1992-10-28 09:33:04 +0000
committerRichard M. Stallman1992-10-28 09:33:04 +0000
commitdb59472c272b9637de8889ad6cd29e75f3d65cdb (patch)
treed8c754598c328e48f8503308259f6726a3ba3c43
parent66c7840d6b0975f8064e23973339f288c814283f (diff)
downloademacs-db59472c272b9637de8889ad6cd29e75f3d65cdb.tar.gz
emacs-db59472c272b9637de8889ad6cd29e75f3d65cdb.zip
(vc-admin): Pass t as noquery arg to vc-resynch-window.
-rw-r--r--lisp/vc.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 676c1f6904e..3dcb81ce2c3 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Version: 4.0 6;; Version: 4.0
7 7
8;; $Id: vc.el,v 1.13 1992/10/06 08:59:39 rms Exp rms $ 8;; $Id: vc.el,v 1.14 1992/10/26 05:33:20 rms Exp rms $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -103,6 +103,9 @@ is sensitive to blank lines.")
103(defvar vc-log-operation nil) 103(defvar vc-log-operation nil)
104(defvar vc-log-after-operation-hook nil) 104(defvar vc-log-after-operation-hook nil)
105 105
106(defvar vc-log-file)
107(defvar vc-log-version)
108
106(defconst vc-name-assoc-file "VC-names") 109(defconst vc-name-assoc-file "VC-names")
107 110
108(defmacro vc-error-occurred (&rest body) 111(defmacro vc-error-occurred (&rest body)
@@ -358,7 +361,8 @@ level to check it in under."
358 (message "Enter initial comment. Type C-c C-c when done.")) 361 (message "Enter initial comment. Type C-c C-c when done."))
359 (progn 362 (progn
360 (vc-backend-admin file rev) 363 (vc-backend-admin file rev)
361 (vc-resynch-window file vc-keep-workfiles)))) 364 ;; Inhibit query here, since otherwise we always get asked.
365 (vc-resynch-window file vc-keep-workfiles t))))
362 366
363(defun vc-steal-lock (file rev &optional owner) 367(defun vc-steal-lock (file rev &optional owner)
364 "Steal the lock on the current workfile." 368 "Steal the lock on the current workfile."