*** vc-rcs.el 23 Jan 2006 03:00:06 +0100 1.46 --- vc-rcs.el 27 Jan 2006 13:02:46 +0100 *************** *** 818,824 **** 'needs-patch)) ;; locked by the calling user ((and (stringp locking-user) ! (string= locking-user (vc-user-login-name))) (if (or (eq (vc-checkout-model file) 'locking) workfile-is-latest (vc-rcs-latest-on-branch-p file workfile-version)) --- 818,824 ---- 'needs-patch)) ;; locked by the calling user ((and (stringp locking-user) ! (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,913 **** (vc-file-setprop file 'vc-state (cond ((eq locking-user 'none) 'up-to-date) ! ((string= locking-user (vc-user-login-name)) 'edited) (t locking-user))) ;; If the file has headers, we don't want to query the ;; master file, because that would eliminate all the --- 907,913 ---- (vc-file-setprop file 'vc-state (cond ((eq locking-user 'none) 'up-to-date) ! ((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