aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc-git.el
diff options
context:
space:
mode:
authorDan Nicolaescu2008-06-24 02:41:04 +0000
committerDan Nicolaescu2008-06-24 02:41:04 +0000
commitf8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f (patch)
tree15bbe0c81b90924ddb26d3bd7a23e154875aad7e /lisp/vc-git.el
parentf245f2c6109b9700d614937eb3a19cc24026fa15 (diff)
downloademacs-f8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f.tar.gz
emacs-f8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f.zip
* 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.
Diffstat (limited to 'lisp/vc-git.el')
-rw-r--r--lisp/vc-git.el2
1 files changed, 2 insertions, 0 deletions
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)."
542 (let ((name (file-relative-name file))) 542 (let ((name (file-relative-name file)))
543 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) 543 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev)))))
544 544
545(declare-function vc-annotate-convert-time "vc-annotate" (time))
546
545(defun vc-git-annotate-time () 547(defun vc-git-annotate-time ()
546 (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) 548 (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)
547 (vc-annotate-convert-time 549 (vc-annotate-convert-time