Mercurial > emacs

changeset 33741:798176da5262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-state instead of vc-locking-user, which no longer exists.
author André Spiegel <spiegel@gnu.org>
date Wed, 22 Nov 2000 12:54:21 +0000
parents fd29993d1f00
children f3a1a5ef5e7f
files lisp/ediff-util.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-util.el	Wed Nov 22 12:50:52 2000 +0000
+++ b/lisp/ediff-util.el	Wed Nov 22 12:54:21 2000 +0000
@@ -1097,12 +1097,15 @@
 (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