diff options
| author | André Spiegel <spiegel@gnu.org> | 2000-11-20 14:16:18 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2000-11-20 14:16:18 +0000 |
| commit | 81d995bb871939c8ec270c2f3e6dc3706e4b1fc9 (patch) | |
| tree | 7122a1f8b39e9642ac470cbfda2a7c4e05066e16 /lisp/vc-cvs.el | |
| parent | ceaa99745a42293fa6f69fbc88e87292e9bee060 (diff) | |
| download | emacs-81d995bb871939c8ec270c2f3e6dc3706e4b1fc9.tar.gz | |
(vc-cvs-checkout): Fix bug that broke C-x v ~-style checkouts.
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index d761b6c625f..4147c2d0e5b 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.11 2000/11/16 16:42:10 spiegel Exp $ +;; $Id: vc-cvs.el,v 1.12 2000/11/16 18:10:52 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -316,7 +316,7 @@ REV is the revision to check out into WORKFILE." (setq default-directory (file-name-directory filename)) (if workfile (let ((failed t) - (backup-name (if (string= filename workfile) + (backup-name (if (string= file workfile) (car (find-backup-file-name filename))))) (when backup-name (copy-file filename backup-name @@ -339,11 +339,11 @@ REV is the revision to check out into WORKFILE." switches))) (setq failed nil)) (if failed - (if backup-name - (rename-file backup-name filename - 'ok-if-already-exists) - (if (file-exists-p filename) - (delete-file filename))) + (if backup-name + (rename-file backup-name filename + 'ok-if-already-exists) + (if (file-exists-p filename) + (delete-file filename))) (and backup-name (not vc-make-backup-files) (delete-file backup-name))))) |