aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2002-03-05 13:30:50 +0000
committerAndré Spiegel2002-03-05 13:30:50 +0000
commit044504d2262b5b1b86ec22d01e0896c4844e5fd1 (patch)
tree190b7d2048ef0005f9a7c0426da9a20cac0eb3d6
parente993e35c8b40af9a6a98d7a7c58f300ba25687bd (diff)
downloademacs-044504d2262b5b1b86ec22d01e0896c4844e5fd1.tar.gz
emacs-044504d2262b5b1b86ec22d01e0896c4844e5fd1.zip
(vc-cvs-diff-tree): Fix typo in parameter names.
-rw-r--r--lisp/vc-cvs.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 6516b130180..3b047c65801 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.33 2002/02/21 20:16:47 spiegel Exp $ 8;; $Id: vc-cvs.el,v 1.34 2002/02/25 22:03:24 spiegel Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -397,7 +397,7 @@ REV is the revision to check out into WORKFILE."
397 (apply 'vc-do-command 397 (apply 'vc-do-command
398 (current-buffer) 0 "cvs" file 398 (current-buffer) 0 "cvs" file
399 "-Q" ; suppress diagnostic output 399 "-Q" ; suppress diagnostic output
400 "update" 400 "update"
401 (and rev (not (string= rev "")) 401 (and rev (not (string= rev ""))
402 (concat "-r" rev)) 402 (concat "-r" rev))
403 "-p" 403 "-p"
@@ -598,13 +598,13 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
598 ;; in the tree via vc-cvs-dir-state-heuristic 598 ;; in the tree via vc-cvs-dir-state-heuristic
599 (unless (vc-up-to-date-p ',f) 599 (unless (vc-up-to-date-p ',f)
600 (message "Looking at %s" ',f) 600 (message "Looking at %s" ',f)
601 (vc-diff-internal ',f ',rel1 ',rel2)))))) 601 (vc-diff-internal ',f ',rev1 ',rev2))))))
602 ;; cvs diff: use a single call for the entire tree 602 ;; cvs diff: use a single call for the entire tree
603 (let ((coding-system-for-read 603 (let ((coding-system-for-read
604 (or coding-system-for-read 'undecided))) 604 (or coding-system-for-read 'undecided)))
605 (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff" 605 (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff"
606 (and rel1 (concat "-r" rel1)) 606 (and rev1 (concat "-r" rev1))
607 (and rel2 (concat "-r" rel2)) 607 (and rev2 (concat "-r" rev2))
608 (vc-diff-switches-list 'CVS)))))) 608 (vc-diff-switches-list 'CVS))))))
609 609
610(defun vc-cvs-annotate-command (file buffer &optional version) 610(defun vc-cvs-annotate-command (file buffer &optional version)