changeset 79725:4ceae4ec8fb2

(vc-hg-log-view-mode): Handle the user field better.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 07 Jan 2008 06:06:25 +0000
parents 1216df323631
children b1e1fa55b0a6
files lisp/ChangeLog lisp/vc-hg.el
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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))))))