[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el

[André Spiegel]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.74 emacs/lisp/vc-cvs.el:1.75
*** emacs/lisp/vc-cvs.el:1.74   Fri Mar 25 08:25:16 2005
--- emacs/lisp/vc-cvs.el        Sun May 22 10:29:44 2005
***************
*** 236,251 ****
  
  (defun vc-cvs-checkout-model (file)
    "CVS-specific version of `vc-checkout-model'."
!   (if (or (getenv "CVSREAD")
!           ;; If the file is not writable (despite CVSREAD being
!           ;; undefined), this is probably because the file is being
!           ;; "watched" by other developers.
!           ;; (If vc-mistrust-permissions was t, we actually shouldn't
!           ;; trust this, but there is no other way to learn this from CVS
!           ;; at the moment (version 1.9).)
!           (string-match "r-..-..-." (nth 8 (file-attributes file))))
        'announce
!     'implicit))
  
  (defun vc-cvs-mode-line-string (file)
    "Return string for placement into the modeline for FILE.
--- 236,254 ----
  
  (defun vc-cvs-checkout-model (file)
    "CVS-specific version of `vc-checkout-model'."
!   (if (getenv "CVSREAD")
        'announce
!     (let ((attrib (file-attributes file)))
!       (if (and attrib ;; don't check further if FILE doesn't exist
!                ;; If the file is not writable (despite CVSREAD being
!                ;; undefined), this is probably because the file is being
!                ;; "watched" by other developers.
!                ;; (If vc-mistrust-permissions was t, we actually shouldn't
!                ;; trust this, but there is no other way to learn this from CVS
!                ;; at the moment (version 1.9).)
!                (string-match "r-..-..-." (nth 8 attrib)))
!           'announce
!         'implicit))))
  
  (defun vc-cvs-mode-line-string (file)
    "Return string for placement into the modeline for FILE.