[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el

[Andre Spiegel]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.34 emacs/lisp/vc-cvs.el:1.35
*** emacs/lisp/vc-cvs.el:1.34   Mon Feb 25 17:03:24 2002
--- emacs/lisp/vc-cvs.el        Tue Mar  5 08:30:50 2002
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.34 2002/02/25 22:03:24 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.35 2002/03/05 13:30:50 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 397,403 ****
                            (apply 'vc-do-command
                                   (current-buffer) 0 "cvs" file
                                   "-Q" ; suppress diagnostic output
!        "update"
                                   (and rev (not (string= rev ""))
                                        (concat "-r" rev))
                                   "-p"
--- 397,403 ----
                            (apply 'vc-do-command
                                   (current-buffer) 0 "cvs" file
                                   "-Q" ; suppress diagnostic output
!                                  "update"
                                   (and rev (not (string= rev ""))
                                        (concat "-r" rev))
                                   "-p"
***************
*** 598,610 ****
                 ;; in the tree via vc-cvs-dir-state-heuristic
                 (unless (vc-up-to-date-p ',f)
                   (message "Looking at %s" ',f)
!                  (vc-diff-internal ',f ',rel1 ',rel2))))))
        ;; cvs diff: use a single call for the entire tree
        (let ((coding-system-for-read
               (or coding-system-for-read 'undecided)))
          (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff"
!                (and rel1 (concat "-r" rel1))
!                (and rel2 (concat "-r" rel2))
                 (vc-diff-switches-list 'CVS))))))
  
  (defun vc-cvs-annotate-command (file buffer &optional version)
--- 598,610 ----
                 ;; in the tree via vc-cvs-dir-state-heuristic
                 (unless (vc-up-to-date-p ',f)
                   (message "Looking at %s" ',f)
!                  (vc-diff-internal ',f ',rev1 ',rev2))))))
        ;; cvs diff: use a single call for the entire tree
        (let ((coding-system-for-read
               (or coding-system-for-read 'undecided)))
          (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff"
!                (and rev1 (concat "-r" rev1))
!                (and rev2 (concat "-r" rev2))
                 (vc-diff-switches-list 'CVS))))))
  
  (defun vc-cvs-annotate-command (file buffer &optional version)