diff options
| author | André Spiegel | 2000-10-27 12:13:19 +0000 |
|---|---|---|
| committer | André Spiegel | 2000-10-27 12:13:19 +0000 |
| commit | f9b59b2b1614f74e7c54939cedbc0c25abc45f58 (patch) | |
| tree | c13f67cd53707d4a3b7140910aeb63c408d90e60 | |
| parent | e3f955b6a652c13a4171659c93631ed1593baeca (diff) | |
| download | emacs-f9b59b2b1614f74e7c54939cedbc0c25abc45f58.tar.gz emacs-f9b59b2b1614f74e7c54939cedbc0c25abc45f58.zip | |
(vc-version-other-window): If an automatic backup of the desired
version exists, rename it instead of copying it.
| -rw-r--r-- | lisp/vc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 6d7d3e948ba..9b523832b14 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.283 2000/10/26 12:38:02 fx Exp $ | 8 | ;; $Id: vc.el,v 1.284 2000/10/26 20:53:11 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -1576,7 +1576,7 @@ If `F.~REV~' already exists, it is used instead of being re-created." | |||
| 1576 | (manual-backup (vc-version-backup-file-name file version 'manual))) | 1576 | (manual-backup (vc-version-backup-file-name file version 'manual))) |
| 1577 | (unless (file-exists-p manual-backup) | 1577 | (unless (file-exists-p manual-backup) |
| 1578 | (if (file-exists-p automatic-backup) | 1578 | (if (file-exists-p automatic-backup) |
| 1579 | (copy-file automatic-backup manual-backup nil 'keep-date) | 1579 | (rename-file automatic-backup manual-backup nil) |
| 1580 | (vc-call checkout file nil version manual-backup))) | 1580 | (vc-call checkout file nil version manual-backup))) |
| 1581 | (find-file-other-window manual-backup))) | 1581 | (find-file-other-window manual-backup))) |
| 1582 | 1582 | ||