# HG changeset patch
# User Thien-Thi Nguyen <ttn@gnuvola.org>
# Date 1195951309 0
# Node ID 68e2cdfcf9311a1d6c736feb6f313363b6020b76
# Parent  ad95f947904093cb5ddc066ae9f9519f2f3be01b
(vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.

diff -r ad95f9479040 -r 68e2cdfcf931 lisp/vc-git.el
--- a/lisp/vc-git.el	Sat Nov 24 21:53:02 2007 +0000
+++ b/lisp/vc-git.el	Sun Nov 25 00:41:49 2007 +0000
@@ -359,7 +359,7 @@
     (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev)))))
 
 (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)
+  (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
         (apply #'encode-time (mapcar (lambda (match)
                                        (string-to-number (match-string match)))