From f3bbec286b9c9aec68636b74366280e891dc91b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Spiegel?= Date: Wed, 22 Nov 2000 12:54:21 +0000 Subject: [PATCH] (ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-state instead of vc-locking-user, which no longer exists. --- lisp/ediff-util.el | 7 +++++-- 1 file 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 -- 2.39.2