# HG changeset patch # User Andr Spiegel # Date 1138389133 0 # Node ID 469f8d55160071c3fe91c47c9cf5ba75e5483f90 # Parent e7dceaa82aae5e58e31e8f7a7a8713a8e1a84f02 (vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to vc-user-login-name. diff -r e7dceaa82aae -r 469f8d551600 lisp/vc-rcs.el --- a/lisp/vc-rcs.el Fri Jan 27 18:55:48 2006 +0000 +++ b/lisp/vc-rcs.el Fri Jan 27 19:12:13 2006 +0000 @@ -818,7 +818,7 @@ '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 @@ (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