summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2001-09-22 20:09:56 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2001-09-22 20:09:56 +0000
commitd455f4f7a97251609c503d8f3250fe883d689069 (patch)
tree51375b2b589a8b4f9112fa173d2beb6da829add6
parenteb407e67ebea66276ce9afc26be09093d9f80dfa (diff)
downloademacs-d455f4f7a97251609c503d8f3250fe883d689069.tar.gz
(vc-delete-automatic-version-backups):
Don't fail if the directory doesn't exist.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-hooks.el14
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c066f7e4c1..2be0cdde46f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2001-09-22 Stefan Monnier <monnier@cs.yale.edu>
+ * vc-hooks.el (vc-delete-automatic-version-backups):
+ Don't fail if the directory doesn't exist.
+
* diff-mode.el (diff-default-read-only): New var.
(diff-mode): Use it.
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index f4d843397e3..5e6eba772cd 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc-hooks.el,v 1.131 2000/11/24 16:25:59 spiegel Exp $
+;; $Id: vc-hooks.el,v 1.132 2001/07/11 22:05:01 monnier Exp $
;; This file is part of GNU Emacs.
@@ -482,11 +482,13 @@ a regexp for matching all such backup files, regardless of the version."
(defun vc-delete-automatic-version-backups (file)
"Delete all existing automatic version backups for FILE."
- (mapcar
- (lambda (f)
- (delete-file f))
- (directory-files (file-name-directory file) t
- (vc-version-backup-file-name file nil nil t))))
+ (condition-case nil
+ (mapcar
+ 'delete-file
+ (directory-files (file-name-directory file) t
+ (vc-version-backup-file-name file nil nil t)))
+ ;; Don't fail when the directory doesn't exist.
+ (file-error nil)))
(defun vc-make-version-backup (file)
"Make a backup copy of FILE, which is assumed in sync with the repository.