Mercurial > emacs
changeset 106506:c43a4817b264
Fix short log parsing and fontification.
* vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number.
Fix fontification for the [merge] label.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 09 Dec 2009 06:04:09 +0000 |
| parents | 7287842d7e07 |
| children | 9506b5eee678 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Dec 09 05:56:53 2009 +0000 +++ b/lisp/ChangeLog Wed Dec 09 06:04:09 2009 +0000 @@ -1,3 +1,9 @@ +2009-12-09 Dan Nicolaescu <dann@ics.uci.edu> + + Fix short log parsing and fontification. + * vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number. + Fix fontification for the [merge] label. + 2009-12-09 Vivek Dasmohapatra <vivek@etla.org> Drop some properties to avoid surprises.
--- a/lisp/vc-bzr.el Wed Dec 09 05:56:53 2009 +0000 +++ b/lisp/vc-bzr.el Wed Dec 09 06:04:09 2009 +0000 @@ -462,7 +462,7 @@ (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) (if vc-short-log - "^ +\\([0-9]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" + "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local @@ -472,7 +472,7 @@ (1 'log-view-message-face) (2 'change-log-name) (3 'change-log-date) - (4 'change-log-list)))) + (4 'change-log-list nil lax)))) (append `((,log-view-message-re . 'log-view-message-face)) ;; log-view-font-lock-keywords '(("^ *committer: \