# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1199685985 0
# Node ID 4ceae4ec8fb28b7b23395a7eb40c7f46aaa86d5f
# Parent  1216df3236315bd12fe8443393ad33f6f5d3a126
(vc-hg-log-view-mode): Handle the user field better.

diff -r 1216df323631 -r 4ceae4ec8fb2 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 07 03:51:03 2008 +0000
+++ b/lisp/ChangeLog	Mon Jan 07 06:06:25 2008 +0000
@@ -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 -r 1216df323631 -r 4ceae4ec8fb2 lisp/vc-hg.el
--- a/lisp/vc-hg.el	Mon Jan 07 03:51:03 2008 +0000
+++ b/lisp/vc-hg.el	Mon Jan 07 06:06:25 2008 +0000
@@ -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))))))