* ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by

'(RCS SCCS) with inverted condition.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f9b85103509b6a696c44c1b7257e74f1c51ac50..a8f031f3f5603ccf181f7dbcee838b06e1cfd837 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Juri Linkov  <juri@jurta.org>
+
+       * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
+       '(RCS SCCS) with inverted condition.
+
 2010-02-02  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 03f5c9fe2a3d1f3c71cca5f9b30cd70bb867ec93..77284a19f5099815b255041b8fa0af9dfb6f8eb6 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -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)))