diff options
| author | Juri Linkov <juri@jurta.org> | 2010-02-03 00:28:57 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2010-02-03 00:28:57 +0200 |
| commit | a0c6a0fb8b426a4a0327176a7cc98185a1402738 (patch) | |
| tree | abe83970d4b291a48b0b38c9863b23ef0b3f106c /lisp/ediff-util.el | |
| parent | c35fcd52222a74cbb94b97f1e169aabd79e97417 (diff) | |
| download | emacs-a0c6a0fb8b426a4a0327176a7cc98185a1402738.tar.gz | |
* ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
'(RCS SCCS) with inverted condition.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 4 |
1 files changed, 2 insertions, 2 deletions
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))) |