diff options
| author | André Spiegel <spiegel@gnu.org> | 2000-11-22 12:54:21 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2000-11-22 12:54:21 +0000 |
| commit | f3bbec286b9c9aec68636b74366280e891dc91b6 (patch) | |
| tree | 99fa6e558f09a7f90ee529bb44d6391d0247089b /lisp/ediff-util.el | |
| parent | 3aeecf97abe4bda318a3d40513282a0fe8f1ca31 (diff) | |
(ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-state
instead of vc-locking-user, which no longer exists.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 1a294cb5f1f..ea0538178a7 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1097,12 +1097,15 @@ of the current buffer." (defsubst ediff-file-checked-out-p (file) (or (not (featurep 'vc-hooks)) (and (vc-backend file) - (vc-locking-user file)))) + (or (memq (vc-state file) '(edited needs-merge)) + (stringp (vc-state file)))))) + (defsubst ediff-file-checked-in-p (file) (and (featurep 'vc-hooks) ;; CVS files are considered not checked in (not (memq (vc-backend file) '(nil CVS))) - (not (vc-locking-user file)))) + (not (memq (vc-state file) '(edited needs-merge))) + (not (stringp (vc-state file))))) (defun ediff-file-compressed-p (file) (condition-case nil |