diff options
| author | André Spiegel | 2001-03-10 10:49:05 +0000 |
|---|---|---|
| committer | André Spiegel | 2001-03-10 10:49:05 +0000 |
| commit | 6e024fc80f30cea722b762197195968fdc692e66 (patch) | |
| tree | 816cda426b5cdd15df981a0e7e336d286a95b4d4 | |
| parent | ad339989e50c06b5465428ea416f8e6e1007707f (diff) | |
| download | emacs-6e024fc80f30cea722b762197195968fdc692e66.tar.gz emacs-6e024fc80f30cea722b762197195968fdc692e66.zip | |
(vc-cvs-checkin): When removing the sticky tag, make output go to
buffer *vc*, not the current buffer.
(vc-cvs-print-log): Output to buffer *vc*, not the current buffer.
(vc-cvs-diff): Output to buffer *vc-diff*, not the current buffer.
| -rw-r--r-- | lisp/vc-cvs.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 2ca04b4f9cd..8c6805d6752 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-cvs.el,v 1.19 2001/02/01 15:10:16 spiegel Exp $ | 8 | ;; $Id: vc-cvs.el,v 1.20 2001/02/02 07:21:21 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -296,7 +296,7 @@ This is only possible if CVS is responsible for FILE's directory." | |||
| 296 | ;; vc-cvs-checkout-model). | 296 | ;; vc-cvs-checkout-model). |
| 297 | (vc-file-setprop file 'vc-checkout-model nil) | 297 | (vc-file-setprop file 'vc-checkout-model nil) |
| 298 | ;; if this was an explicit check-in, remove the sticky tag | 298 | ;; if this was an explicit check-in, remove the sticky tag |
| 299 | (if rev (vc-do-command t 0 "cvs" file "update" "-A")))) | 299 | (if rev (vc-do-command nil 0 "cvs" file "update" "-A")))) |
| 300 | 300 | ||
| 301 | (defun vc-cvs-checkout (file &optional editable rev workfile) | 301 | (defun vc-cvs-checkout (file &optional editable rev workfile) |
| 302 | "Retrieve a revision of FILE into a WORKFILE. | 302 | "Retrieve a revision of FILE into a WORKFILE. |
| @@ -461,7 +461,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." | |||
| 461 | 461 | ||
| 462 | (defun vc-cvs-print-log (file) | 462 | (defun vc-cvs-print-log (file) |
| 463 | "Get change log associated with FILE." | 463 | "Get change log associated with FILE." |
| 464 | (vc-do-command t (if (vc-cvs-stay-local-p file) 'async 0) | 464 | (vc-do-command nil (if (vc-cvs-stay-local-p file) 'async 0) |
| 465 | "cvs" file "log")) | 465 | "cvs" file "log")) |
| 466 | 466 | ||
| 467 | (defun vc-cvs-show-log-entry (version) | 467 | (defun vc-cvs-show-log-entry (version) |
| @@ -504,11 +504,11 @@ The changes are between FIRST-VERSION and SECOND-VERSION." | |||
| 504 | (error "No revisions of %s exist" file) | 504 | (error "No revisions of %s exist" file) |
| 505 | ;; we regard this as "changed". | 505 | ;; we regard this as "changed". |
| 506 | ;; diff it against /dev/null. | 506 | ;; diff it against /dev/null. |
| 507 | (apply 'vc-do-command t | 507 | (apply 'vc-do-command "*vc-diff*" |
| 508 | 1 "diff" file | 508 | 1 "diff" file |
| 509 | (append diff-switches-list '("/dev/null")))) | 509 | (append diff-switches-list '("/dev/null")))) |
| 510 | (setq status | 510 | (setq status |
| 511 | (apply 'vc-do-command t | 511 | (apply 'vc-do-command "*vc-diff*" |
| 512 | (if (vc-cvs-stay-local-p file) 'async 1) | 512 | (if (vc-cvs-stay-local-p file) 'async 1) |
| 513 | "cvs" file "diff" | 513 | "cvs" file "diff" |
| 514 | (and oldvers (concat "-r" oldvers)) | 514 | (and oldvers (concat "-r" oldvers)) |