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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c56108ca0207a9fc47c627c3a253831172c602ce..3b8769bbe66db2a4a57afadabca0cc37782a269a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 5d467a7018cfaafdc9c621868c4fd3ea9edb033b..b636e2f9250d9bc3cc0b66988a66ffc9a6bcd939 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -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))))))