(ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-state

instead of vc-locking-user, which no longer exists.

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 1a294cb5f1f8f125a84eb346f01ead1234ff20d3..ea0538178a71ebcf78d1ac1417ab9df0d7fdc01a 100644 (file)
--- 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