# HG changeset patch # User Stefan Monnier # Date 1052418309 0 # Node ID 6b9cefee3eeea68245caf5b6b9649c1b8e96857f # Parent 8806616471e2d98a2aba8c4feb12563340fd7fd7 (vc-mcvs-read): Don't require `file' to exist. (vc-mcvs-diff): Don't return 0 for newly added empty files. diff -r 8806616471e2 -r 6b9cefee3eee lisp/vc-mcvs.el --- a/lisp/vc-mcvs.el Thu May 08 18:23:53 2003 +0000 +++ b/lisp/vc-mcvs.el Thu May 08 18:25:09 2003 +0000 @@ -150,10 +150,11 @@ root)))) (defun vc-mcvs-read (file) - (with-temp-buffer - (insert-file-contents file) - (goto-char (point-min)) - (read (current-buffer)))) + (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,7 +486,9 @@ ;; Note: this is NOT a "mcvs diff". (apply 'vc-do-command "*vc-diff*" 1 "diff" file - (append diff-switches-list '("/dev/null")))) + (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)