diff options
| author | Richard M. Stallman <rms@gnu.org> | 1992-10-28 09:33:04 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1992-10-28 09:33:04 +0000 |
| commit | db59472c272b9637de8889ad6cd29e75f3d65cdb (patch) | |
| tree | d8c754598c328e48f8503308259f6726a3ba3c43 /lisp | |
| parent | 66c7840d6b0975f8064e23973339f288c814283f (diff) | |
| download | emacs-db59472c272b9637de8889ad6cd29e75f3d65cdb.tar.gz emacs-db59472c272b9637de8889ad6cd29e75f3d65cdb.tar.bz2 emacs-db59472c272b9637de8889ad6cd29e75f3d65cdb.zip | |
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc.el | 8 |
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 @@ ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Version: 4.0 -;; $Id: vc.el,v 1.13 1992/10/06 08:59:39 rms Exp rms $ +;; $Id: vc.el,v 1.14 1992/10/26 05:33:20 rms Exp rms $ ;; This file is part of GNU Emacs. @@ -103,6 +103,9 @@ is sensitive to blank lines.") (defvar vc-log-operation nil) (defvar vc-log-after-operation-hook nil) +(defvar vc-log-file) +(defvar vc-log-version) + (defconst vc-name-assoc-file "VC-names") (defmacro vc-error-occurred (&rest body) @@ -358,7 +361,8 @@ level to check it in under." (message "Enter initial comment. Type C-c C-c when done.")) (progn (vc-backend-admin file rev) - (vc-resynch-window file vc-keep-workfiles)))) + ;; Inhibit query here, since otherwise we always get asked. + (vc-resynch-window file vc-keep-workfiles t)))) (defun vc-steal-lock (file rev &optional owner) "Steal the lock on the current workfile." |