[Emacs-diffs] /srv/bzr/emacs/trunk r99435: * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by

[Juri Linkov]

------------------------------------------------------------
revno: 99435
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-03 00:28:57 +0200
message:
  * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
  '(RCS SCCS) with inverted condition.
modified:
  lisp/ChangeLog
  lisp/ediff-util.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-02 11:19:36 +0000
+++ b/lisp/ChangeLog    2010-02-02 22:28:57 +0000
@@ -1,3 +1,8 @@
+2010-02-02  Juri Linkov  <address@hidden>
+
+       * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
+       '(RCS SCCS) with inverted condition.
+
 2010-02-02  Michael Albinus  <address@hidden>
 
        * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"

=== modified file 'lisp/ediff-util.el'
--- a/lisp/ediff-util.el        2010-01-13 08:35:10 +0000
+++ b/lisp/ediff-util.el        2010-02-02 22:28:57 +0000
@@ -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)))