diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a54f4b3461b..f0a40eca019 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-06-24 Dan Nicolaescu + + * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer): + * vc-rcs.el (vc-annotate-convert-time): + * vc-mtn.el (vc-annotate-convert-time): + * vc-git.el (vc-annotate-convert-time): + * vc-cvs.el (vc-annotate-convert-time): + * vc-bzr.el (vc-annotate-convert-time): Declare as functions. + 2008-06-23 Dan Nicolaescu * vc-annotate.el (vc-annotate-mode): Derive from special-mode diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 70704dc4d5e..64cc8ade8aa 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -536,6 +536,8 @@ property containing author and date information." (replace-match "") (insert tag " |"))))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) + (defun vc-bzr-annotate-time () (when (re-search-forward "^ *[0-9.]+ +|" nil t) (let ((prop (get-text-property (line-beginning-position) 'help-echo))) diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 88d0b717653..eeb4ef08e1a 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -570,6 +570,8 @@ Optional arg REVISION is a revision to annotate from." (re-search-forward vc-cvs-annotate-first-line-re) (delete-region (point-min) (1- (point))))))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) + (defun vc-cvs-annotate-current-time () "Return the current time, based at midnight of the current day, and encoded as fractional days." diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 4a5b7ab8403..2293f275910 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -542,6 +542,8 @@ or BRANCH^ (where \"^\" can be repeated)." (let ((name (file-relative-name file))) (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) + (defun vc-git-annotate-time () (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) (vc-annotate-convert-time diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 663609d39b3..2f738303a19 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -289,6 +289,7 @@ Optional arg REVISION is a revision to annotate from." (re-search-forward "^[ \t]*[0-9]") (delete-region (point-min) (match-beginning 0)))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) ;; The format for one line output by "hg annotate -d -n" looks like this: ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS @@ -425,6 +426,8 @@ REV is the revision to check out into WORKFILE." rename-state ;; rename or copy state extra-name) ;; original name for copies and rename targets, new name for +(declare-function vc-default-status-printer "vc-dir" (backend fileentry)) + (defun vc-hg-status-printer (info) "Pretty-printer for the vc-dir-fileinfo structure." (let ((extra (vc-dir-fileinfo->extra info))) diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el index b20b1db48d0..42defb6f233 100644 --- a/lisp/vc-mtn.el +++ b/lisp/vc-mtn.el @@ -190,6 +190,8 @@ (apply 'vc-mtn-command buf 0 file "annotate" (if rev (list "-r" rev)))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) + (defconst vc-mtn-annotate-full-re "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ") (defconst vc-mtn-annotate-any-re diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 9d0550880ce..06e06c503f3 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -769,6 +769,8 @@ Optional arg REVISION is a revision to annotate from." (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) (forward-line 1)))) +(declare-function vc-annotate-convert-time "vc-annotate" (time)) + (defun vc-rcs-annotate-current-time () "Return the current time, based at midnight of the current day, and encoded as fractional days."