Mercurial > emacs

changeset 68415:469f8d551600

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to vc-user-login-name.
author André Spiegel <spiegel@gnu.org>
date Fri, 27 Jan 2006 19:12:13 +0000
parents e7dceaa82aae
children 64e8a95ba226
files lisp/vc-rcs.el
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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