Fix default-directory for vc-root-diff.

[bpt/emacs.git] / lisp / ediff-util.el

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 4dfd6f6..77284a1 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1,7 +1,7 @@
 ;;; ediff-util.el --- the core commands and utilities of ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -1126,8 +1126,8 @@ of the current buffer."
 
 (defun ediff-file-checked-in-p (file)
   (and (featurep 'vc-hooks)
-       ;; CVS files are considered not checked in
-       (not (memq (vc-backend file) '(nil CVS)))
+       ;; Only RCS and SCCS files are considered checked in
+       (memq (vc-backend file) '(RCS SCCS))
        (if (fboundp 'vc-state)
           (and
            (not (memq (vc-state file) '(edited needs-merge)))