diff options
| author | Stefan Monnier | 2001-09-22 20:09:56 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-09-22 20:09:56 +0000 |
| commit | d455f4f7a97251609c503d8f3250fe883d689069 (patch) | |
| tree | 51375b2b589a8b4f9112fa173d2beb6da829add6 | |
| parent | eb407e67ebea66276ce9afc26be09093d9f80dfa (diff) | |
| download | emacs-d455f4f7a97251609c503d8f3250fe883d689069.tar.gz emacs-d455f4f7a97251609c503d8f3250fe883d689069.zip | |
(vc-delete-automatic-version-backups):
Don't fail if the directory doesn't exist.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 14 |
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 @@ | |||
| 1 | 2001-09-22 Stefan Monnier <monnier@cs.yale.edu> | 1 | 2001-09-22 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 2 | ||
| 3 | * vc-hooks.el (vc-delete-automatic-version-backups): | ||
| 4 | Don't fail if the directory doesn't exist. | ||
| 5 | |||
| 3 | * diff-mode.el (diff-default-read-only): New var. | 6 | * diff-mode.el (diff-default-read-only): New var. |
| 4 | (diff-mode): Use it. | 7 | (diff-mode): Use it. |
| 5 | 8 | ||
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 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-hooks.el,v 1.131 2000/11/24 16:25:59 spiegel Exp $ | 8 | ;; $Id: vc-hooks.el,v 1.132 2001/07/11 22:05:01 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -482,11 +482,13 @@ a regexp for matching all such backup files, regardless of the version." | |||
| 482 | 482 | ||
| 483 | (defun vc-delete-automatic-version-backups (file) | 483 | (defun vc-delete-automatic-version-backups (file) |
| 484 | "Delete all existing automatic version backups for FILE." | 484 | "Delete all existing automatic version backups for FILE." |
| 485 | (mapcar | 485 | (condition-case nil |
| 486 | (lambda (f) | 486 | (mapcar |
| 487 | (delete-file f)) | 487 | 'delete-file |
| 488 | (directory-files (file-name-directory file) t | 488 | (directory-files (file-name-directory file) t |
| 489 | (vc-version-backup-file-name file nil nil t)))) | 489 | (vc-version-backup-file-name file nil nil t))) |
| 490 | ;; Don't fail when the directory doesn't exist. | ||
| 491 | (file-error nil))) | ||
| 490 | 492 | ||
| 491 | (defun vc-make-version-backup (file) | 493 | (defun vc-make-version-backup (file) |
| 492 | "Make a backup copy of FILE, which is assumed in sync with the repository. | 494 | "Make a backup copy of FILE, which is assumed in sync with the repository. |