Mercurial > emacs
changeset 86422:68e2cdfcf931
(vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.
| author | Thien-Thi Nguyen <ttn@gnuvola.org> |
|---|---|
| date | Sun, 25 Nov 2007 00:41:49 +0000 |
| parents | ad95f9479040 |
| children | 4325c9655d0d |
| files | lisp/vc-git.el |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)))