diff options
| author | Richard M. Stallman | 1992-09-28 13:01:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1992-09-28 13:01:53 +0000 |
| commit | 60213ed03b03259ba862e1d5f47199f14df8d842 (patch) | |
| tree | 6537279920f83457c2bd988dcfcbb41ccdce88b6 | |
| parent | 090e4588a24a32902ec9c6ef7ed536d7d471a3c0 (diff) | |
| download | emacs-60213ed03b03259ba862e1d5f47199f14df8d842.tar.gz emacs-60213ed03b03259ba862e1d5f47199f14df8d842.zip | |
(vc-rename-file): Use OLD, not FILE which is unbound.
| -rw-r--r-- | lisp/vc.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 1b8afcfa1d3..b7f4e171b5e 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Version: 4.0 | 6 | ;; Version: 4.0 |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.5 1992/09/27 01:51:04 roland Exp roland $ | 8 | ;; $Id: vc.el,v 1.6 1992/09/27 02:42:08 roland Exp rms $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -746,7 +746,8 @@ to that version." | |||
| 746 | (if (vc-locking-user old) | 746 | (if (vc-locking-user old) |
| 747 | (error "Please check in files before moving them.")) | 747 | (error "Please check in files before moving them.")) |
| 748 | (if (or (file-symlink-p oldmaster) | 748 | (if (or (file-symlink-p oldmaster) |
| 749 | (file-symlink-p (vc-backend-subdirectory-name file))) | 749 | ;; This had FILE, I changed it to OLD. -- rms. |
| 750 | (file-symlink-p (vc-backend-subdirectory-name old))) | ||
| 750 | (error "This is not a safe thing to do in the presence of symbolic links.")) | 751 | (error "This is not a safe thing to do in the presence of symbolic links.")) |
| 751 | (rename-file oldmaster (vc-name new))) | 752 | (rename-file oldmaster (vc-name new))) |
| 752 | (if (or (not oldmaster) (file-exists-p old)) | 753 | (if (or (not oldmaster) (file-exists-p old)) |
| @@ -759,7 +760,8 @@ to that version." | |||
| 759 | (set-buffer oldbuf) | 760 | (set-buffer oldbuf) |
| 760 | (set-visited-file-name new) | 761 | (set-visited-file-name new) |
| 761 | (set-buffer-modified-p nil)))) | 762 | (set-buffer-modified-p nil)))) |
| 762 | (vc-backend-dispatch file | 763 | ;; This had FILE, I changed it to OLD. -- rms. |
| 764 | (vc-backend-dispatch old | ||
| 763 | (vc-record-rename old new) | 765 | (vc-record-rename old new) |
| 764 | nil) | 766 | nil) |
| 765 | ) | 767 | ) |