Commit a0c6a0fb authored by Juri Linkov's avatar Juri Linkov
Browse files

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

'(RCS SCCS) with inverted condition.
parent c35fcd52
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"
......
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment