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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b4bbaa8fdad70825b77424cefbd4a2a961192be..eea22d639d75050c8cffa35f401452a7e550813a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 84cd589d4b7154e31b8f825037f145999ccf8ea6..3d9fe2be463e3fd887e961834f5a2ef7f6985238 100644 (file)
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -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