[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.33 emacs/lisp/vc-cvs.el:1.34
*** emacs/lisp/vc-cvs.el:1.33   Thu Feb 21 15:16:47 2002
--- emacs/lisp/vc-cvs.el        Mon Feb 25 17:03:24 2002
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.33 2002/02/21 20:16:47 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.34 2002/02/25 22:03:24 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 559,565 ****
  
  (defun vc-cvs-diff (file &optional oldvers newvers)
    "Get a difference report using CVS between two versions of FILE."
!   (let (options status (diff-switches-list (vc-diff-switches-list cvs)))
      (if (string= (vc-workfile-version file) "0")
        ;; This file is added but not yet committed; there is no master file.
        (if (or oldvers newvers)
--- 559,565 ----
  
  (defun vc-cvs-diff (file &optional oldvers newvers)
    "Get a difference report using CVS between two versions of FILE."
!   (let (options status (diff-switches-list (vc-diff-switches-list 'CVS)))
      (if (string= (vc-workfile-version file) "0")
        ;; This file is added but not yet committed; there is no master file.
        (if (or oldvers newvers)
***************
*** 605,611 ****
          (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)
    "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
--- 605,611 ----
          (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)
    "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.