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

[Stefan Monnier]

Index: emacs/lisp/vc-mcvs.el
diff -c emacs/lisp/vc-mcvs.el:1.4 emacs/lisp/vc-mcvs.el:1.5
*** emacs/lisp/vc-mcvs.el:1.4   Sun May  4 14:38:31 2003
--- emacs/lisp/vc-mcvs.el       Thu May  8 14:25:09 2003
***************
*** 150,159 ****
         root))))
  
  (defun vc-mcvs-read (file)
!   (with-temp-buffer
!     (insert-file-contents file)
!     (goto-char (point-min))
!     (read (current-buffer))))
  
  (defun vc-mcvs-map-file (dir file)
    (let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))
--- 150,160 ----
         root))))
  
  (defun vc-mcvs-read (file)
!   (if (file-readable-p file)
!       (with-temp-buffer
!       (insert-file-contents file)
!       (goto-char (point-min))
!       (read (current-buffer)))))
  
  (defun vc-mcvs-map-file (dir file)
    (let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))
***************
*** 485,491 ****
            ;; Note: this is NOT a "mcvs diff".
            (apply 'vc-do-command "*vc-diff*"
                   1 "diff" file
!                  (append diff-switches-list '("/dev/null"))))
        (setq status
              (apply 'vc-mcvs-command "*vc-diff*"
                     (if (and (vc-mcvs-stay-local-p file)
--- 486,494 ----
            ;; Note: this is NOT a "mcvs diff".
            (apply 'vc-do-command "*vc-diff*"
                   1 "diff" file
!                  (append diff-switches-list '("/dev/null")))
!         ;; Even if it's empty, it's locally modified.
!         1)
        (setq status
              (apply 'vc-mcvs-command "*vc-diff*"
                     (if (and (vc-mcvs-stay-local-p file)