# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1264399403 28800
# Node ID e9c454218ac89e99d407060afbe04d9a792b8fab
# Parent  61edd42cf483865d71e6c09556626009bc9a6341
(vc-bzr-print-log): Use the more compact --line option
for the short log.
(vc-bzr-log-view-mode): Adjust regexp for the above change.

diff -r 61edd42cf483 -r e9c454218ac8 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 25 00:03:35 2010 -0500
+++ b/lisp/ChangeLog	Sun Jan 24 22:03:23 2010 -0800
@@ -1,3 +1,9 @@
+2010-01-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-print-log): Use the more compact --line option
+	for the short log.
+	(vc-bzr-log-view-mode): Adjust regexp for the above change.
+
 2010-01-25  Mark A. Hershberger  <mah@everybody.org>
 
 	* progmodes/python.el: Replace reference to obsolete
diff -r 61edd42cf483 -r e9c454218ac8 lisp/vc-bzr.el
--- a/lisp/vc-bzr.el	Mon Jan 25 00:03:35 2010 -0500
+++ b/lisp/vc-bzr.el	Sun Jan 24 22:03:23 2010 -0800
@@ -487,7 +487,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
@@ -519,7 +519,7 @@
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
 	   (append
-	    (when shortlog '("--short"))
+	    (when shortlog '("--line"))
 	    (when start-revision (list (format "-r..%s" start-revision)))
 	    (when limit (list "-l" (format "%s" limit)))
 	    (if (stringp vc-bzr-log-switches)