#

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8df7088503b0b886ba4ec55838eaa10f90ba334d..89e4e75d7ef44bde39517465b9ef783d23a67dbb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2000-10-22  Andre Spiegel  <spiegel@gnu.org>
+
+       * vc-hooks.el (vc-version-backup-file-name): New optional args 
+       MANUAL and REGEXP.
+       (vc-delete-automatic-version-backups, vc-make-version-backup): 
+       New functions.
+       (vc-before-save): Use the latter.
+       (vc-default-make-version-backups-p): Added `-p' suffix to avoid
+       confusion.
+
+       * vc-cvs.el (vc-cvs-make-version-backups-p): Added `-p' suffix as 
+       expected by vc[-hooks].el.
+
+       * vc.el (vc-checkout): Added `-p' suffix in call to
+       vc-make-version-backups-p; use vc-make-version-backup to actually
+       make the backup.
+       (vc-version-other-window, vc-version-backup-file): Handle both
+       automatic and manual backups.
+       (vc-revert-file): Use vc-delete-automatic-version-backups to get rid
+       of all of them.
+
 2000-10-22  Miles Bader  <miles@gnu.org>
 
        * comint.el (comint-highlight-input, comint-highlight-prompt):