Commit 99999a1d authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

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.
parent 2ea1c4aa
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.
......
......@@ -462,7 +462,7 @@ REV non-nil gets an error."
(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 @@ REV non-nil gets an error."
(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: \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment