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

[Miles Bader]

Index: emacs/lisp/vc-mcvs.el
diff -c emacs/lisp/vc-mcvs.el:1.11.2.2 emacs/lisp/vc-mcvs.el:1.11.2.3
*** emacs/lisp/vc-mcvs.el:1.11.2.2      Thu Feb  5 14:48:33 2004
--- emacs/lisp/vc-mcvs.el       Tue Jul  6 09:31:50 2004
***************
*** 438,454 ****
  ;;; History functions
  ;;;
  
! (defun vc-mcvs-print-log (file)
    "Get change log associated with FILE."
    (let ((default-directory (vc-mcvs-root file)))
      ;; Run the command from the root dir so that `mcvs filt' returns
      ;; valid relative names.
      (vc-mcvs-command
!      nil
       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
       file "log")))
  
! (defun vc-mcvs-diff (file &optional oldvers newvers)
    "Get a difference report using Meta-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.
--- 438,454 ----
  ;;; History functions
  ;;;
  
! (defun vc-mcvs-print-log (file &optional buffer)
    "Get change log associated with FILE."
    (let ((default-directory (vc-mcvs-root file)))
      ;; Run the command from the root dir so that `mcvs filt' returns
      ;; valid relative names.
      (vc-mcvs-command
!      buffer
       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
       file "log")))
  
! (defun vc-mcvs-diff (file &optional oldvers newvers buffer)
    "Get a difference report using Meta-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.
***************
*** 457,463 ****
        ;; We regard this as "changed".
        ;; Diff it against /dev/null.
        ;; Note: this is NOT a "mcvs diff".
!       (apply 'vc-do-command "*vc-diff*"
               1 "diff" file
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
--- 457,463 ----
        ;; We regard this as "changed".
        ;; Diff it against /dev/null.
        ;; Note: this is NOT a "mcvs 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.
***************
*** 467,473 ****
           ;; valid relative names.
           (default-directory (vc-mcvs-root file))
           (status
!           (apply 'vc-mcvs-command "*vc-diff*"
                   (if async 'async 1)
                   file "diff"
                   (and oldvers (concat "-r" oldvers))
--- 467,473 ----
           ;; valid relative names.
           (default-directory (vc-mcvs-root file))
           (status
!           (apply 'vc-mcvs-command (or buffer "*vc-diff*")
                   (if async 'async 1)
                   file "diff"
                   (and oldvers (concat "-r" oldvers))