From: Juri Linkov <juri@jurta.org>
Date: Tue, 2 Feb 2010 22:28:57 +0000 (+0200)
Subject: * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
X-Git-Tag: emacs-pretest-23.1.93~123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0c6a0fb8b426a4a0327176a7cc98185a1402738;p=emacs.git

* 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 2f9b8510350..a8f031f3f56 100644
--- 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 03f5c9fe2a3..77284a19f50 100644
--- 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)))