diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-09-24 22:30:31 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-09-24 22:30:31 +0000 |
| commit | ab750f9c1977a0e8a530d5c9eb3f6879b7a5ec40 (patch) | |
| tree | 3f569e1f90e7daea89a6dcb8862cbcb1b636152a | |
| parent | 6f6fd5ef4d952f3cbc0f2ef2992b3dc11918b8c7 (diff) | |
| download | emacs-ab750f9c1977a0e8a530d5c9eb3f6879b7a5ec40.tar.gz | |
(vc-checkin): Use vc-delete-automatic-version-backups.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 292066c4c6d..70a64259254 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -17,6 +17,8 @@ 2001-09-24 Stefan Monnier <monnier@cs.yale.edu> + * vc.el (vc-checkin): Use vc-delete-automatic-version-backups. + * pcvs-parse.el (cvs-parse-commit): Expand the file name before passing it to VC. diff --git a/lisp/vc.el b/lisp/vc.el index df95187fa4c..6a20527d06f 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -6,7 +6,7 @@ ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Keywords: tools -;; $Id: vc.el,v 1.309 2001/09/17 09:59:41 spiegel Exp $ +;; $Id: vc.el,v 1.310 2001/09/22 20:04:21 monnier Exp $ ;; This file is part of GNU Emacs. @@ -1514,9 +1514,9 @@ Runs the normal hook `vc-checkin-hook'." file ;; Change buffers to get local value of vc-checkin-switches. (with-current-buffer (or (get-file-buffer file) (current-buffer)) - (let ((backup-file (vc-version-backup-file file))) + (progn (vc-call checkin file rev comment) - (if backup-file (delete-file backup-file)))) + (vc-delete-automatic-version-backups file))) `((vc-state . up-to-date) (vc-checkout-time . ,(nth 5 (file-attributes file))) (vc-workfile-version . nil))) |