summaryrefslogtreecommitdiff
path: root/lisp/vc-cvs.el
diff options
context:
space:
mode:
authorAndré Spiegel <spiegel@gnu.org>2004-03-21 15:45:31 +0000
committerAndré Spiegel <spiegel@gnu.org>2004-03-21 15:45:31 +0000
commita9817cc4043be50bcf8f2860747181b9b459fcf4 (patch)
tree95856f426c819a953fd446299f251d1d43a56ea8 /lisp/vc-cvs.el
parent7f149224deb6d478ca9718db8f36fea692c282b2 (diff)
downloademacs-a9817cc4043be50bcf8f2860747181b9b459fcf4.tar.gz
(vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument.
Diffstat (limited to 'lisp/vc-cvs.el')
-rw-r--r--lisp/vc-cvs.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 400a1ffb105..0c1e6bc1745 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc-cvs.el,v 1.66 2003/10/01 13:22:53 fx Exp $
+;; $Id: vc-cvs.el,v 1.67 2004/01/20 17:41:18 uid65624 Exp $
;; This file is part of GNU Emacs.
@@ -533,14 +533,14 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
;;; History functions
;;;
-(defun vc-cvs-print-log (file)
+(defun vc-cvs-print-log (file &optional buffer)
"Get change log associated with FILE."
(vc-cvs-command
- nil
+ buffer
(if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
file "log"))
-(defun vc-cvs-diff (file &optional oldvers newvers)
+(defun vc-cvs-diff (file &optional oldvers newvers buffer)
"Get a difference report using CVS between two versions of FILE."
(if (string= (vc-workfile-version file) "0")
;; This file is added but not yet committed; there is no master file.
@@ -549,13 +549,13 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
;; We regard this as "changed".
;; Diff it against /dev/null.
;; Note: this is NOT a "cvs diff".
- (apply 'vc-do-command "*vc-diff*"
+ (apply 'vc-do-command (or buffer "*vc-diff*")
1 "diff" file
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
(let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
- (status (apply 'vc-cvs-command "*vc-diff*"
+ (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
(if async 'async 1)
file "diff"
(and oldvers (concat "-r" oldvers))