aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2004-03-21 15:45:31 +0000
committerAndré Spiegel2004-03-21 15:45:31 +0000
commita9817cc4043be50bcf8f2860747181b9b459fcf4 (patch)
tree95856f426c819a953fd446299f251d1d43a56ea8
parent7f149224deb6d478ca9718db8f36fea692c282b2 (diff)
downloademacs-a9817cc4043be50bcf8f2860747181b9b459fcf4.tar.gz
emacs-a9817cc4043be50bcf8f2860747181b9b459fcf4.zip
(vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument.
-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 @@
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.66 2003/10/01 13:22:53 fx Exp $ 8;; $Id: vc-cvs.el,v 1.67 2004/01/20 17:41:18 uid65624 Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -533,14 +533,14 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
533;;; History functions 533;;; History functions
534;;; 534;;;
535 535
536(defun vc-cvs-print-log (file) 536(defun vc-cvs-print-log (file &optional buffer)
537 "Get change log associated with FILE." 537 "Get change log associated with FILE."
538 (vc-cvs-command 538 (vc-cvs-command
539 nil 539 buffer
540 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) 540 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
541 file "log")) 541 file "log"))
542 542
543(defun vc-cvs-diff (file &optional oldvers newvers) 543(defun vc-cvs-diff (file &optional oldvers newvers buffer)
544 "Get a difference report using CVS between two versions of FILE." 544 "Get a difference report using CVS between two versions of FILE."
545 (if (string= (vc-workfile-version file) "0") 545 (if (string= (vc-workfile-version file) "0")
546 ;; This file is added but not yet committed; there is no master file. 546 ;; 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."
549 ;; We regard this as "changed". 549 ;; We regard this as "changed".
550 ;; Diff it against /dev/null. 550 ;; Diff it against /dev/null.
551 ;; Note: this is NOT a "cvs diff". 551 ;; Note: this is NOT a "cvs diff".
552 (apply 'vc-do-command "*vc-diff*" 552 (apply 'vc-do-command (or buffer "*vc-diff*")
553 1 "diff" file 553 1 "diff" file
554 (append (vc-switches nil 'diff) '("/dev/null"))) 554 (append (vc-switches nil 'diff) '("/dev/null")))
555 ;; Even if it's empty, it's locally modified. 555 ;; Even if it's empty, it's locally modified.
556 1) 556 1)
557 (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process))) 557 (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
558 (status (apply 'vc-cvs-command "*vc-diff*" 558 (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
559 (if async 'async 1) 559 (if async 'async 1)
560 file "diff" 560 file "diff"
561 (and oldvers (concat "-r" oldvers)) 561 (and oldvers (concat "-r" oldvers))