diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-11-25 00:42:41 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-11-25 00:42:41 +0000 |
| commit | 0bcc6163fe83d56aef78034841e8938504d487da (patch) | |
| tree | 748aae031dc12ccd8160eac6fa3e6c9836af444f /lisp/vc-git.el | |
| parent | cb6c237a6f3444bebe104f59ae6502fad7dca8da (diff) | |
| download | emacs-0bcc6163fe83d56aef78034841e8938504d487da.tar.gz | |
(vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.
Diffstat (limited to 'lisp/vc-git.el')
| -rw-r--r-- | lisp/vc-git.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 5652f386f7f..1d0297209b5 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -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))) |