Commit 0bcc6163 authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

(vc-git-annotate-time): Handle optional field FILENAME.

Also, match one space at end of annotation text, after last paren.
parent cb6c237a
......@@ -25,6 +25,9 @@
(vc-annotate-display-autoscale)
(vc-annotate-display-difference): Use it.
* vc-git.el (vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.
2007-11-24 Michael Albinus <michael.albinus@gmx.de>
* ido.el (ido-file-name-all-completions-1): Check for fboundp of
......
......@@ -359,7 +359,7 @@ or BRANCH^ (where \"^\" can be repeated)."
(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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment