(vc-checkin): Use vc-delete-automatic-version-backups.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 292066c4c6dd9e7332d00a505acdf0775c830a63..70a64259254549ce19b95f94d43eb2b3a279e63a 100644 (file)
--- 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 df95187fa4c85fdb0f70ad8af9370450cf06d907..6a20527d06f6f8695ad9cab24481f9bbb3aa8c32 100644 (file)
--- 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)))