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

[André Spiegel]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.71 emacs/lisp/vc-cvs.el:1.72
*** emacs/lisp/vc-cvs.el:1.71   Tue Nov 30 11:02:23 2004
--- emacs/lisp/vc-cvs.el        Sun Jan  9 21:28:53 2005
***************
*** 548,554 ****
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
        1)
!     (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
           (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
                          (if async 'async 1)
                          file "diff"
--- 548,556 ----
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
        1)
!     (let* ((async (and (not vc-disable-async-diff) 
!                        (vc-stay-local-p file)
!                        (fboundp 'start-process)))
           (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
                          (if async 'async 1)
                          file "diff"