* vc-sccs.el (vc-sccs-register):

* vc-rcs.el (vc-rcs-register):
* vc-cvs.el (vc-cvs-register): Don't clear file's properties.
* vc.el (vc-register): Clear file's properties.

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 362e1e4032ea1de6d16266d31bb80d570eafcef6..95e2252c7f2903cba770df307af61f4d329b0689 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.2 2000/09/05 20:08:20 monnier Exp $
+;; $Id: vc-cvs.el,v 1.3 2000/09/07 20:01:53 fx Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -557,7 +557,6 @@ COMMENT can be used to provide an initial description of FILE.
 
 `vc-register-switches' and `vc-cvs-register-switches' are passed to
 the CVS command (in that order)."
-    (vc-file-clearprops file)
     (let ((switches (list
                     (if (stringp vc-register-switches)
                         (list vc-register-switches)

diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 5856d089e4c800b812ff8d53f7264c3e70d04f75..2cc42744dc48003e326e5651f1b4a8acc334bbcd 100644 (file)
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-rcs.el,v 1.2 2000/09/05 20:08:21 monnier Exp $
+;; $Id: vc-rcs.el,v 1.3 2000/09/07 20:02:38 fx Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -637,7 +637,6 @@ the RCS command (in that order).
 
 Automatically retrieve a read-only version of the file with keywords
 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
-    (vc-file-clearprops file)
     (let ((subdir (expand-file-name "RCS" (file-name-directory file)))
          (switches (list
                     (if (stringp vc-register-switches)

diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index 03bcdfd1d7449ee3574543dfdcd652ff784b9fb8..db618915e90e571efb9202254a497009fce132f1 100644 (file)
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-sccs.el,v 1.2 2000/09/05 20:08:22 monnier Exp $
+;; $Id: vc-sccs.el,v 1.3 2000/09/07 20:06:55 fx Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -297,7 +297,6 @@ the SCCS command (in that order).
 
 Automatically retrieve a read-only version of the file with keywords
 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
-    (vc-file-clearprops file)
     (let* ((switches (list
                     (if (stringp vc-register-switches)
                         (list vc-register-switches)

diff --git a/lisp/vc.el b/lisp/vc.el
index cb3b71b2e37f86094765a4618dbffa3820460ead..fa4dba9af9ed1f38b1645b46cc848a240b2fc9e0 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1018,10 +1018,10 @@ merge in the changes into your working copy."
 ;;;###autoload
 (defun vc-register (&optional set-version comment)
   "Register the current file into a version control system.
-With prefix argument SET-VERSION, allow user to specify initial version 
+With prefix argument SET-VERSION, allow user to specify initial version
 level.  If COMMENT is present, use that as an initial comment.
 
-The version-control system to use is found by cycling through the list
+The version control system to use is found by cycling through the list
 `vc-handled-backends'.  The first backend in that list which declares
 itself responsible for the file (usually because other files in that
 directory are already registered under that backend) will be used to
@@ -1053,6 +1053,7 @@ first backend that could register the file is used."
                  (lambda (file rev comment)
                    (message "Registering %s... " file)
                    (let ((backend (vc-responsible-backend file)))
+                     (vc-file-clearprops file)
                      (vc-call-backend backend 'register file rev comment)
                      (vc-file-setprop file 'vc-backend backend)
                      (unless vc-make-backup-files