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