diff options
| author | Stefan Monnier | 2000-10-25 21:45:09 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2000-10-25 21:45:09 +0000 |
| commit | 5e011cb2e878f607b7154af46b6aec94e0df27a5 (patch) | |
| tree | 0d2ec6fe69f90b4db747263e065a3a105d636f5e /lisp | |
| parent | 3d647abe6a5ada3b71f4b49cdc3857498428c12d (diff) | |
| download | emacs-5e011cb2e878f607b7154af46b6aec94e0df27a5.tar.gz emacs-5e011cb2e878f607b7154af46b6aec94e0df27a5.zip | |
(vc-version-other-window): Bind `file'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 3229ae9864e..7a236c84975 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.280 2000/10/10 01:25:40 ttn Exp $ | 8 | ;; $Id: vc.el,v 1.281 2000/10/22 15:37:51 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -1570,15 +1570,16 @@ If the current buffer is named `F', the version is named `F.~REV~'. | |||
| 1570 | If `F.~REV~' already exists, it is used instead of being re-created." | 1570 | If `F.~REV~' already exists, it is used instead of being re-created." |
| 1571 | (interactive "sVersion to visit (default is workfile version): ") | 1571 | (interactive "sVersion to visit (default is workfile version): ") |
| 1572 | (vc-ensure-vc-buffer) | 1572 | (vc-ensure-vc-buffer) |
| 1573 | (let* ((version (if (string-equal rev "") | 1573 | (let* ((file buffer-file-name) |
| 1574 | (vc-workfile-version buffer-file-name) | 1574 | (version (if (string-equal rev "") |
| 1575 | (vc-workfile-version file) | ||
| 1575 | rev)) | 1576 | rev)) |
| 1576 | (automatic-backup (vc-version-backup-file-name file version)) | 1577 | (automatic-backup (vc-version-backup-file-name file version)) |
| 1577 | (manual-backup (vc-version-backup-file-name file version 'manual))) | 1578 | (manual-backup (vc-version-backup-file-name file version 'manual))) |
| 1578 | (unless (file-exists-p manual-backup) | 1579 | (unless (file-exists-p manual-backup) |
| 1579 | (if (file-exists-p automatic-backup) | 1580 | (if (file-exists-p automatic-backup) |
| 1580 | (copy-file automatic-backup manual-backup nil 'keep-date) | 1581 | (copy-file automatic-backup manual-backup nil 'keep-date) |
| 1581 | (vc-call checkout buffer-file-name nil version manual-backup))) | 1582 | (vc-call checkout file nil version manual-backup))) |
| 1582 | (find-file-other-window manual-backup))) | 1583 | (find-file-other-window manual-backup))) |
| 1583 | 1584 | ||
| 1584 | ;; Header-insertion code | 1585 | ;; Header-insertion code |