(vc-git-log-view-mode): Add font-lock patterns for

Signed-off-by, Acked-by and Merge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce68071ddda120694a7b8f98198d7ef565b2066b..adab960465955afe92fe5711377369dfcae7df14 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index ed4b1270972315b77adebe684fe1f0324145c2fd..88946f160ff5d76fda3e726c103e662adbc5e644 100644 (file)
--- 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))))))