[Emacs-diffs] Changes to emacs/lisp/vc-rcs.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/05 06:38:04

Index: vc-rcs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- vc-rcs.el   2 May 2008 17:47:25 -0000       1.69
+++ vc-rcs.el   5 May 2008 06:38:04 -0000       1.70
@@ -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