From 4f147528512f6e67ffeb2fa9a14821ce744d5484 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Spiegel?= Date: Fri, 27 Jan 2006 19:12:13 +0000 Subject: [PATCH] (vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to vc-user-login-name. --- lisp/vc-rcs.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 0729064c72b..bfb66e8a5cf 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -818,7 +818,7 @@ file." 'needs-patch)) ;; locked by the calling user ((and (stringp locking-user) - (string= locking-user (vc-user-login-name))) + (string= locking-user (vc-user-login-name file))) (if (or (eq (vc-checkout-model file) 'locking) workfile-is-latest (vc-rcs-latest-on-branch-p file workfile-version)) @@ -907,7 +907,8 @@ Returns: nil if no headers were found (vc-file-setprop file 'vc-state (cond ((eq locking-user 'none) 'up-to-date) - ((string= locking-user (vc-user-login-name)) 'edited) + ((string= locking-user (vc-user-login-name file)) + 'edited) (t locking-user))) ;; If the file has headers, we don't want to query the ;; master file, because that would eliminate all the -- 2.39.2