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

[Thien-Thi Nguyen]

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.68 emacs/lisp/vc-cvs.el:1.69
*** emacs/lisp/vc-cvs.el:1.68   Sun Mar 21 15:45:31 2004
--- emacs/lisp/vc-cvs.el        Wed Nov  3 14:16:14 2004
***************
*** 89,100 ****
  The value can also be a regular expression or list of regular
  expressions to match against the host name of a repository; then VC
  only stays local for hosts that match it.  Alternatively, the value
! can be a list of regular expressions where the first element is the 
! symbol `except'; then VC always stays local except for hosts matched 
  by these regular expressions."
    :type '(choice (const :tag "Always stay local" t)
                  (const :tag "Don't stay local" nil)
!                  (list :format "\nExamine hostname and %v" :tag "Examine 
hostname ..." 
                         (set :format "%v" :inline t (const :format "%t" :tag 
"don't" except))
                         (regexp :format " stay local,\n%t: %v" :tag "if it 
matches")
                         (repeat :format "%v%i\n" :inline t (regexp :tag 
"or"))))
--- 89,100 ----
  The value can also be a regular expression or list of regular
  expressions to match against the host name of a repository; then VC
  only stays local for hosts that match it.  Alternatively, the value
! can be a list of regular expressions where the first element is the
! symbol `except'; then VC always stays local except for hosts matched
  by these regular expressions."
    :type '(choice (const :tag "Always stay local" t)
                  (const :tag "Don't stay local" nil)
!                  (list :format "\nExamine hostname and %v" :tag "Examine 
hostname ..."
                         (set :format "%v" :inline t (const :format "%t" :tag 
"don't" except))
                         (regexp :format " stay local,\n%t: %v" :tag "if it 
matches")
                         (repeat :format "%v%i\n" :inline t (regexp :tag 
"or"))))
***************
*** 590,596 ****
  (defun vc-cvs-annotate-command (file buffer &optional version)
    "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
  Optional arg VERSION is a version to annotate from."
!   (vc-cvs-command buffer 0 file "annotate" (if version (concat "-r" 
version))))
  
  (defun vc-cvs-annotate-current-time ()
    "Return the current time, based at midnight of the current day, and
--- 590,600 ----
  (defun vc-cvs-annotate-command (file buffer &optional version)
    "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
  Optional arg VERSION is a version to annotate from."
!   (vc-cvs-command buffer 0 file "annotate" (if version (concat "-r" version)))
!   (with-current-buffer buffer
!     (goto-char (point-min))
!     (re-search-forward "^[0-9]")
!     (delete-region (point-min) (1- (point)))))
  
  (defun vc-cvs-annotate-current-time ()
    "Return the current time, based at midnight of the current day, and
***************
*** 839,845 ****
    (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
--- 843,849 ----
    (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
***************
*** 929,935 ****
             "\\(.*\\)"))               ;Sticky tag
      (vc-file-setprop file 'vc-workfile-version (match-string 1))
      (vc-file-setprop file 'vc-cvs-sticky-tag
!                    (vc-cvs-parse-sticky-tag (match-string 4) 
                                                (match-string 5)))
      ;; Compare checkout time and modification time.
      ;; This is intentionally different from the algorithm that CVS uses
--- 933,939 ----
             "\\(.*\\)"))               ;Sticky tag
      (vc-file-setprop file 'vc-workfile-version (match-string 1))
      (vc-file-setprop file 'vc-cvs-sticky-tag
!                    (vc-cvs-parse-sticky-tag (match-string 4)
                                                (match-string 5)))
      ;; Compare checkout time and modification time.
      ;; This is intentionally different from the algorithm that CVS uses