changeset 78820:25e6b97b8f02

(vc-git-log-view-mode): Add font-lock patterns for Signed-off-by, Acked-by and Merge.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 17 Sep 2007 19:13:19 +0000
parents 9390b3d333bb
children 4341c4b4d652
files lisp/ChangeLog lisp/vc-git.el
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Sep 17 07:05:20 2007 +0000
+++ b/lisp/ChangeLog	Mon Sep 17 19:13:19 2007 +0000
@@ -1,3 +1,8 @@
+2007-09-17  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* 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  <rgm@gnu.org>
 
 	* textmodes/tex-mode.el (tex-compilation-parse-errors): Prefer the
--- a/lisp/vc-git.el	Mon Sep 17 07:05:20 2007 +0000
+++ b/lisp/vc-git.el	Mon Sep 17 19:13:19 2007 +0000
@@ -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))))))