# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1265149737 -7200
# Node ID 163cd2024354c6f29f78e1915229aef6c7bddfed
# Parent  abe576120f7685496f1ffeed060e1fcd848a2f56
* ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
'(RCS SCCS) with inverted condition.

diff -r abe576120f76 -r 163cd2024354 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 02 12:19:36 2010 +0100
+++ b/lisp/ChangeLog	Wed Feb 03 00:28:57 2010 +0200
@@ -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 -r abe576120f76 -r 163cd2024354 lisp/ediff-util.el
--- a/lisp/ediff-util.el	Tue Feb 02 12:19:36 2010 +0100
+++ b/lisp/ediff-util.el	Wed Feb 03 00:28:57 2010 +0200
@@ -1126,8 +1126,8 @@
 
 (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)))