summaryrefslogtreecommitdiff
path: root/lisp/vc-hg.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-01-07 06:06:25 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-01-07 06:06:25 +0000
commit1030ad5e1122092073dc58bcd9d2125cc8cdf5cb (patch)
tree3288b45c4e44fc8366cd488fd72121b9c30abcab /lisp/vc-hg.el
parent6e498a976637c8879170f015aa9d3ca0f0b27419 (diff)
downloademacs-1030ad5e1122092073dc58bcd9d2125cc8cdf5cb.tar.gz
(vc-hg-log-view-mode): Handle the user field better.
Diffstat (limited to 'lisp/vc-hg.el')
-rw-r--r--lisp/vc-hg.el11
1 files changed, 7 insertions, 4 deletions
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))))))