From c256ef15d44e40a439a43ba295006a5ef2c2b0bd Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 1 Apr 2000 05:16:08 +0000 Subject: [PATCH] Don't prompt for comment when registering files in vc-dired. --- v7/src/edwin/vc.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm index 354658a44..a83cd8e38 100644 --- a/v7/src/edwin/vc.scm +++ b/v7/src/edwin/vc.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: vc.scm,v 1.57 2000/04/01 05:14:00 cph Exp $ +;;; $Id: vc.scm,v 1.58 2000/04/01 05:16:08 cph Exp $ ;;; ;;; Copyright (c) 1994-2000 Massachusetts Institute of Technology ;;; @@ -549,13 +549,13 @@ merge in the changes into your working copy." (if (there-exists? files (lambda (file) (let ((master (file-vc-master (car file) #f))) - (or (not master) - (if (cvs-master? master) - (memq (cvs-status master) - '(LOCALLY-MODIFIED - LOCALLY-ADDED - LOCALLY-REMOVED)) - (vc-backend-locking-user master #f)))))) + (and master + (if (cvs-master? master) + (memq (cvs-status master) + '(LOCALLY-MODIFIED + LOCALLY-ADDED + LOCALLY-REMOVED)) + (vc-backend-locking-user master #f)))))) #f "") (lambda (comment) -- 2.25.1