diff options
| author | André Spiegel | 2006-01-22 16:08:48 +0000 |
|---|---|---|
| committer | André Spiegel | 2006-01-22 16:08:48 +0000 |
| commit | b010f88755f1c6db321eac9606b0464b5c660949 (patch) | |
| tree | c7aba7fd9e564641c4a802a13afe55a6033f8561 | |
| parent | 3bfa5b1fcc59d2edf69c9fa8f79c2c07ac3d7a73 (diff) | |
| download | emacs-b010f88755f1c6db321eac9606b0464b5c660949.tar.gz emacs-b010f88755f1c6db321eac9606b0464b5c660949.zip | |
(vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
`string'. This allows us to get rid of `vc-user-login-name UID'.
| -rw-r--r-- | lisp/vc-rcs.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index e301804cf17..0729064c72b 100644 --- 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'." | |||
| 152 | (vc-file-setprop file 'vc-checkout-model 'locking)))) | 152 | (vc-file-setprop file 'vc-checkout-model 'locking)))) |
| 153 | state) | 153 | state) |
| 154 | (if (not (vc-mistrust-permissions file)) | 154 | (if (not (vc-mistrust-permissions file)) |
| 155 | (let* ((attributes (file-attributes file)) | 155 | (let* ((attributes (file-attributes file 'string)) |
| 156 | (owner-uid (nth 2 attributes)) | 156 | (owner-name (nth 2 attributes)) |
| 157 | (permissions (nth 8 attributes))) | 157 | (permissions (nth 8 attributes))) |
| 158 | (cond ((string-match ".r-..-..-." permissions) | 158 | (cond ((string-match ".r-..-..-." permissions) |
| 159 | (vc-file-setprop file 'vc-checkout-model 'locking) | 159 | (vc-file-setprop file 'vc-checkout-model 'locking) |
| @@ -162,7 +162,7 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 162 | (if (eq (vc-checkout-model file) 'locking) | 162 | (if (eq (vc-checkout-model file) 'locking) |
| 163 | (if (file-ownership-preserved-p file) | 163 | (if (file-ownership-preserved-p file) |
| 164 | 'edited | 164 | 'edited |
| 165 | (vc-user-login-name owner-uid)) | 165 | owner-name) |
| 166 | (if (vc-rcs-workfile-is-newer file) | 166 | (if (vc-rcs-workfile-is-newer file) |
| 167 | 'edited | 167 | 'edited |
| 168 | 'up-to-date))) | 168 | 'up-to-date))) |