diff options
| -rw-r--r-- | lisp/vc-rcs.el | 5 |
1 files 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." | |||
| 818 | 'needs-patch)) | 818 | 'needs-patch)) |
| 819 | ;; locked by the calling user | 819 | ;; locked by the calling user |
| 820 | ((and (stringp locking-user) | 820 | ((and (stringp locking-user) |
| 821 | (string= locking-user (vc-user-login-name))) | 821 | (string= locking-user (vc-user-login-name file))) |
| 822 | (if (or (eq (vc-checkout-model file) 'locking) | 822 | (if (or (eq (vc-checkout-model file) 'locking) |
| 823 | workfile-is-latest | 823 | workfile-is-latest |
| 824 | (vc-rcs-latest-on-branch-p file workfile-version)) | 824 | (vc-rcs-latest-on-branch-p file workfile-version)) |
| @@ -907,7 +907,8 @@ Returns: nil if no headers were found | |||
| 907 | (vc-file-setprop file 'vc-state | 907 | (vc-file-setprop file 'vc-state |
| 908 | (cond | 908 | (cond |
| 909 | ((eq locking-user 'none) 'up-to-date) | 909 | ((eq locking-user 'none) 'up-to-date) |
| 910 | ((string= locking-user (vc-user-login-name)) 'edited) | 910 | ((string= locking-user (vc-user-login-name file)) |
| 911 | 'edited) | ||
| 911 | (t locking-user))) | 912 | (t locking-user))) |
| 912 | ;; If the file has headers, we don't want to query the | 913 | ;; If the file has headers, we don't want to query the |
| 913 | ;; master file, because that would eliminate all the | 914 | ;; master file, because that would eliminate all the |