Mercurial > emacs
changeset 1494:64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 28 Oct 1992 09:33:04 +0000 |
| parents | b207a60243f6 |
| children | f17665e7347e |
| files | lisp/vc.el |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Wed Oct 28 09:15:05 1992 +0000 +++ b/lisp/vc.el Wed Oct 28 09:33:04 1992 +0000 @@ -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 @@ (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 @@ (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."