Mercurial > emacs
changeset 31520:f9d2d484e1e2
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 09 Sep 2000 00:48:41 +0000 |
| parents | 5a14247e8e26 |
| children | 8fa910d9155b |
| files | lisp/vc-cvs.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc.el |
| diffstat | 4 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Sat Sep 09 00:18:25 2000 +0000 +++ b/lisp/vc-cvs.el Sat Sep 09 00:48:41 2000 +0000 @@ -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 @@ `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)
--- a/lisp/vc-rcs.el Sat Sep 09 00:18:25 2000 +0000 +++ b/lisp/vc-rcs.el Sat Sep 09 00:48:41 2000 +0000 @@ -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 @@ 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)
--- a/lisp/vc-sccs.el Sat Sep 09 00:18:25 2000 +0000 +++ b/lisp/vc-sccs.el Sat Sep 09 00:48:41 2000 +0000 @@ -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 @@ 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)
--- a/lisp/vc.el Sat Sep 09 00:18:25 2000 +0000 +++ b/lisp/vc.el Sat Sep 09 00:48:41 2000 +0000 @@ -1018,10 +1018,10 @@ ;;;###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 @@ (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