(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.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84cfa2adcff..6e86aa2a94a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index b3bbc272faa..8861fef0388 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -487,7 +487,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
@@ -519,7 +519,7 @@ REV non-nil gets an error."
   (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)