diff options
| author | Dan Nicolaescu <[email protected]> | 2007-09-17 19:13:19 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2007-09-17 19:13:19 +0000 |
| commit | 576c7f5e194536575bf144f08803fd76f3d6995a (patch) | |
| tree | b62e8b60a85783167ee315f56dbeb756ff864071 | |
| parent | f61ac501ef4dca8f5c3f4fce694ba31f4d2d04b2 (diff) | |
(vc-git-log-view-mode): Add font-lock patterns for
Signed-off-by, Acked-by and Merge.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce68071ddd..adab960465 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-17 Dan Nicolaescu <[email protected]> + + * vc-git.el (vc-git-log-view-mode): Add font-lock patterns for + Signed-off-by, Acked-by and Merge. + 2007-09-17 Glenn Morris <[email protected]> * textmodes/tex-mode.el (tex-compilation-parse-errors): Prefer the diff --git a/lisp/vc-git.el b/lisp/vc-git.el index ed4b127097..88946f160f 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -290,6 +290,14 @@ ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" (1 'change-log-name) (2 'change-log-email)) + ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" + (1 'change-log-name)) + ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" + (1 'change-log-name) + (2 'change-log-email)) + ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" + (1 'change-log-acknowledgement) + (2 'change-log-acknowledgement)) ("^Date: \\(.+\\)" (1 'change-log-date)) ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) |