# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1262025291 28800
# Node ID 8437678ea169b698e4fc414a7dcff7b72c03d7fa
# Parent  04cdd0140564b5f715c3cf79b8587f5d82f2fcd8
(vc-bzr-log-view-mode): Fix short log regexp.

diff -r 04cdd0140564 -r 8437678ea169 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 28 16:25:05 2009 +0100
+++ b/lisp/ChangeLog	Mon Dec 28 10:34:51 2009 -0800
@@ -1,3 +1,7 @@
+2009-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-log-view-mode): Fix short log regexp.
+
 2009-12-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	Supersede color.diff settings in git log (bug#5211).
diff -r 04cdd0140564 -r 8437678ea169 lisp/vc-bzr.el
--- a/lisp/vc-bzr.el	Mon Dec 28 16:25:05 2009 +0100
+++ b/lisp/vc-bzr.el	Mon Dec 28 10:34:51 2009 -0800
@@ -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