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

[Andre Spiegel]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.52 emacs/lisp/vc-cvs.el:1.53
*** emacs/lisp/vc-cvs.el:1.52   Thu Mar 27 17:38:38 2003
--- emacs/lisp/vc-cvs.el        Sat Apr  5 10:51:14 2003
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.52 2003/03/27 22:38:38 schwab Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.53 2003/04/05 15:51:14 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 169,175 ****
          (case-fold-search nil))
      (if (file-readable-p (expand-file-name "CVS/Entries" dirname))
        (with-temp-buffer
!           (vc-insert-file (expand-file-name "CVS/Entries" dirname))
            (goto-char (point-min))
          (cond
           ((re-search-forward
--- 169,175 ----
          (case-fold-search nil))
      (if (file-readable-p (expand-file-name "CVS/Entries" dirname))
        (with-temp-buffer
!           (vc-cvs-get-entries dirname)
            (goto-char (point-min))
          (cond
           ((re-search-forward
***************
*** 781,787 ****
  (defun vc-cvs-dir-state-heuristic (dir)
    "Find the CVS state of all files in DIR, using only local information."
    (with-temp-buffer
!     (vc-insert-file (expand-file-name "CVS/Entries" dir))
      (goto-char (point-min))
      (while (not (eobp))
        ;; CVS-removed files are not taken under VC control.
--- 781,787 ----
  (defun vc-cvs-dir-state-heuristic (dir)
    "Find the CVS state of all files in DIR, using only local information."
    (with-temp-buffer
!     (vc-cvs-get-entries dir)
      (goto-char (point-min))
      (while (not (eobp))
        ;; CVS-removed files are not taken under VC control.
***************
*** 791,797 ****
            (vc-cvs-parse-entry file t))))
        (forward-line 1))))
  
! 
  (defun vc-cvs-valid-symbolic-tag-name-p (tag)
    "Return non-nil if TAG is a valid symbolic tag name."
    ;; According to the CVS manual, a valid symbolic tag must start with
--- 791,805 ----
            (vc-cvs-parse-entry file t))))
        (forward-line 1))))
  
! (defun vc-cvs-get-entries (dir)
!   "Insert the CVS/Entries file from below DIR into the current buffer.
! This function ensures that the correct coding system is used for that,
! which may not be the one that is used for the files' contents.
! CVS/Entries should only be accessed through this function."
!   (let ((coding-system-for-read (or file-name-coding-system
!                                     default-file-name-coding-system)))
!     (vc-insert-file (expand-file-name "CVS/Entries" dir))))
!      
  (defun vc-cvs-valid-symbolic-tag-name-p (tag)
    "Return non-nil if TAG is a valid symbolic tag name."
    ;; According to the CVS manual, a valid symbolic tag must start with