diff options
| author | Eric S. Raymond | 1993-03-11 07:45:02 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 1993-03-11 07:45:02 +0000 |
| commit | 91463d45d0c529d7ceefac15aaf9fcd0a6db3c2b (patch) | |
| tree | 55be4a444f1b89a515b336690b4394cbc5a6267a | |
| parent | 5bf54166016af8025bfc4405c017efbfd84f8d65 (diff) | |
| download | emacs-91463d45d0c529d7ceefac15aaf9fcd0a6db3c2b.tar.gz emacs-91463d45d0c529d7ceefac15aaf9fcd0a6db3c2b.zip | |
Bug fix.
| -rw-r--r-- | lisp/vc.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 9981c733ae7..d863a6371e9 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: 5.0 | 6 | ;; Version: 5.0 |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.23 1993/03/09 22:56:29 eric Exp eric $ | 8 | ;; $Id: vc.el,v 1.24 1993/03/09 23:02:40 eric Exp eric $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -1109,7 +1109,6 @@ Return nil if there is no such person." | |||
| 1109 | ;; it deletes the workfile. | 1109 | ;; it deletes the workfile. |
| 1110 | (message "Checking in %s..." file) | 1110 | (message "Checking in %s..." file) |
| 1111 | (save-excursion | 1111 | (save-excursion |
| 1112 | (message "Stealing lock on %s..." file) | ||
| 1113 | ;; Change buffers to get local value of vc-checkin-switches. | 1112 | ;; Change buffers to get local value of vc-checkin-switches. |
| 1114 | (set-buffer (or (get-file-buffer file) (current-buffer))) | 1113 | (set-buffer (or (get-file-buffer file) (current-buffer))) |
| 1115 | (vc-backend-dispatch file | 1114 | (vc-backend-dispatch file |
| @@ -1119,13 +1118,11 @@ Return nil if there is no such person." | |||
| 1119 | (concat "-y" comment) | 1118 | (concat "-y" comment) |
| 1120 | vc-checkin-switches) | 1119 | vc-checkin-switches) |
| 1121 | (if vc-keep-workfiles | 1120 | (if vc-keep-workfiles |
| 1122 | (message "Stealing lock on %s...done" file) | ||
| 1123 | (vc-do-command 0 "get" file)) | 1121 | (vc-do-command 0 "get" file)) |
| 1124 | ) | 1122 | ) |
| 1125 | (apply 'vc-do-command 0 "ci" file | 1123 | (apply 'vc-do-command 0 "ci" file |
| 1126 | (concat (if vc-keep-workfiles "-u" "-r") rev) | 1124 | (concat (if vc-keep-workfiles "-u" "-r") rev) |
| 1127 | (concat "-m" comment) | 1125 | (concat "-m" comment) |
| 1128 | (message "Removing last change from %s..." file) | ||
| 1129 | vc-checkin-switches) | 1126 | vc-checkin-switches) |
| 1130 | )) | 1127 | )) |
| 1131 | (vc-file-setprop file 'vc-locking-user nil) | 1128 | (vc-file-setprop file 'vc-locking-user nil) |