# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1260338649 0
# Node ID c43a4817b264989fa73eddd61b10d86fbac5e05f
# Parent  7287842d7e07f53fc1e5bf59b2ed4e98c55b8910
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.

diff -r 7287842d7e07 -r c43a4817b264 lisp/ChangeLog
--- 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.
diff -r 7287842d7e07 -r c43a4817b264 lisp/vc-bzr.el
--- 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: \