diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-02-24 22:51:00 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-02-24 22:51:00 +0000 |
| commit | 59e9dbbc6395b3364e96049eef8ee0f96e1a8343 (patch) | |
| tree | 4cd5f92ccf92b34a68220ed92f65ffca99ad66ef /lisp/vc-mcvs.el | |
| parent | a8bdd228f8663936fbcd378928dacefefc49b7ad (diff) | |
| download | emacs-59e9dbbc6395b3364e96049eef8ee0f96e1a8343.tar.gz | |
(vc-mcvs-register): Fix let-binding (for use of `file').
Diffstat (limited to 'lisp/vc-mcvs.el')
| -rw-r--r-- | lisp/vc-mcvs.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index 73fe7457dfa..6be69e47bd8 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -216,7 +216,7 @@ COMMENT can be used to provide an initial description of FILE. the Meta-CVS command (in that order)." ;; FIXME: multiple-file case should be made to work (if (> (length files) 1) (error "Registering filesets is not yet supported.")) - (let* ((file (car files)) + (let* ((file (car files)) (filename (file-name-nondirectory file)) (extpos (string-match "\\." filename)) (ext (if extpos (substring filename (1+ extpos)))) @@ -245,19 +245,19 @@ the Meta-CVS command (in that order)." (pp types (current-buffer)) (save-buffer) (unless (get-buffer-window (current-buffer) t) - (kill-buffer (current-buffer))))))) - ;; Now do the ADD. - (prog1 (apply 'vc-mcvs-command nil 0 file - "add" - (and comment (string-match "[^\t\n ]" comment) - (concat "-m" comment)) - (vc-switches 'MCVS 'register)) - ;; I'm not sure exactly why, but if we don't setup the inode and root - ;; prop of the file, things break later on in vc-mode-line that - ;; ends up calling vc-mcvs-working-revision. - ;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p - ;; doesn't try to call `mcvs diff' on the file. - (vc-mcvs-registered file))) + (kill-buffer (current-buffer)))))) + ;; Now do the ADD. + (prog1 (apply 'vc-mcvs-command nil 0 file + "add" + (and comment (string-match "[^\t\n ]" comment) + (concat "-m" comment)) + (vc-switches 'MCVS 'register)) + ;; I'm not sure exactly why, but if we don't setup the inode and root + ;; prop of the file, things break later on in vc-mode-line that + ;; ends up calling vc-mcvs-working-revision. + ;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p + ;; doesn't try to call `mcvs diff' on the file. + (vc-mcvs-registered file)))) (defalias 'vc-mcvs-responsible-p 'vc-mcvs-root "Return non-nil if CVS thinks it is responsible for FILE.") |