procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Also, match one space at end of annotation text, after last paren.
This commit is contained in:
Thien-Thi Nguyen 2007-11-25 00:42:41 +00:00
parent cb6c237a6f
commit 0bcc6163fe
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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

2
lisp/vc-git.el
View file

@ -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)))