(vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT

`string'.  This allows us to get rid of `vc-user-login-name UID'.

diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index e301804cf1727b8b04a7495ee3d1326b8593a33b..0729064c72bc0091687d014912c90994adb5f274 100644 (file)
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -152,8 +152,8 @@ For a description of possible values, see `vc-check-master-templates'."
                 (vc-file-setprop file 'vc-checkout-model 'locking))))
           state)
       (if (not (vc-mistrust-permissions file))
-          (let* ((attributes  (file-attributes file))
-                 (owner-uid   (nth 2 attributes))
+          (let* ((attributes  (file-attributes file 'string))
+                 (owner-name  (nth 2 attributes))
                  (permissions (nth 8 attributes)))
             (cond ((string-match ".r-..-..-." permissions)
                    (vc-file-setprop file 'vc-checkout-model 'locking)
@@ -162,7 +162,7 @@ For a description of possible values, see `vc-check-master-templates'."
                   (if (eq (vc-checkout-model file) 'locking)
                       (if (file-ownership-preserved-p file)
                           'edited
-                        (vc-user-login-name owner-uid))
+                        owner-name)
                     (if (vc-rcs-workfile-is-newer file)
                         'edited
                       'up-to-date)))