Don't prompt for comment when registering files in vc-dired.
authorChris Hanson <org/chris-hanson/cph>
Sat, 1 Apr 2000 05:16:08 +0000 (05:16 +0000)
committerChris Hanson <org/chris-hanson/cph>
Sat, 1 Apr 2000 05:16:08 +0000 (05:16 +0000)
v7/src/edwin/vc.scm

index 354658a44e5652c641d038700b3f1b4367d176bb..a83cd8e38e3d8f1f90e6cdc8050b7cd61f67c272 100644 (file)
@@ -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)