Mercurial > emacs
changeset 94627:9cc7bc51e055
(vc-rcs-fetch-master-state): Fix inf-loop.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 May 2008 06:38:04 +0000 |
| parents | 5eb3ee73ed4e |
| children | a088027cd6c2 |
| files | lisp/ChangeLog lisp/vc-rcs.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 05 06:16:20 2008 +0000 +++ b/lisp/ChangeLog Mon May 05 06:38:04 2008 +0000 @@ -1,3 +1,7 @@ +2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-rcs.el (vc-rcs-fetch-master-state): Fix inf-loop. + 2008-05-05 Tom Tromey <tromey@redhat.com> * smerge-mode.el (smerge-start-session): Don't call smerge-next if
--- a/lisp/vc-rcs.el Mon May 05 06:16:20 2008 +0000 +++ b/lisp/vc-rcs.el Mon May 05 06:38:04 2008 +0000 @@ -893,7 +893,8 @@ ;; locked by the calling user ((and (stringp locking-user) (string= locking-user (vc-user-login-name file))) - (if (or (eq (vc-rcs-checkout-model (list file)) 'locking) + ;; Don't call `vc-rcs-checkout-model' to avoid inf-looping. + (if (or (eq (vc-file-getprop file 'vc-checkout-model) 'locking) workfile-is-latest (vc-rcs-latest-on-branch-p file working-revision)) 'edited