(vc-hg-log-view-mode): Handle the user field better.

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6c1031b36e..2bbd04602f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-hg.el (vc-hg-log-view-mode): Handle the user field better.
+
 2008-01-07  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gud-gdb-command-name): Explain
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index ac4f333f749..9e76a67e8ae 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -256,15 +256,18 @@
   (set (make-local-variable 'log-view-font-lock-keywords)
        (append
         log-view-font-lock-keywords
-        ;; Handle the case:
-        ;; user: foo@bar
-        '(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
-           (1 'change-log-email))
+        '(
           ;; Handle the case:
           ;; user: FirstName LastName <foo@bar>
           ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
            (1 'change-log-name)
            (2 'change-log-email))
+          ;; Handle the cases:
+          ;; user: foo@bar 
+          ;; and 
+          ;; user: foo
+          ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
+           (1 'change-log-email))
           ("^date: \\(.+\\)" (1 'change-log-date))
           ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))