mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-01 03:11:09 -08:00
Code Issues Projects Releases Wiki Activity

(vc-rcs-fetch-master-state): Fix inf-loop.

Browse source
This commit is contained in:
Stefan Monnier 2008-05-05 06:38:04 +00:00
parent 8653eee82e
commit 11a36f646e
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

3
lisp/vc-rcs.el
View file

@ -893,7 +893,8 @@ file."
;; 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