diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-git.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0873acd70a2..997cc9d5ec4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 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))) |