# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1199686211 0
# Node ID 7ca7e531270cc28dea730cd0ffacdc3bd4c7dbff
# Parent  26665fb0f6044461f9a96da7246bde676b993a66
(vc-hg-log-view-mode): Handle the user field better.

diff -r 26665fb0f604 -r 7ca7e531270c lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 07 03:04:01 2008 +0000
+++ b/lisp/ChangeLog	Mon Jan 07 06:10:11 2008 +0000
@@ -2,6 +2,7 @@
 
 	* vc-hg.el (vc-hg-dir-state, vc-hg-dir-status): Pass the dir
 	argument to vc-hg-command.
+	(vc-hg-log-view-mode): Handle the user field better.
 
 2008-01-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff -r 26665fb0f604 -r 7ca7e531270c lisp/vc-hg.el
--- a/lisp/vc-hg.el	Mon Jan 07 03:04:01 2008 +0000
+++ b/lisp/vc-hg.el	Mon Jan 07 06:10:11 2008 +0000
@@ -286,15 +286,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))))))