mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
(vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.
This commit is contained in:
parent
cb6c237a6f
commit
0bcc6163fe
2 changed files with 4 additions and 1 deletions
|
|
@ -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)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue