From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 20 Jun 2008 18:12:01 +0000 (+0000)
Subject: (vc-bzr-annotate-extract-revision-at-line):
X-Git-Tag: emacs-pretest-23.0.90~4632
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96be1503689cf25bc9d99ae231a00c72f15a1088;p=emacs.git

(vc-bzr-annotate-extract-revision-at-line):
Allow more than one space before the |.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bbeee66b27..b80d9ac90af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc-bzr.el (vc-bzr-annotate-extract-revision-at-line):
+	Allow more than one space before the |.
+
 	* textmodes/rst.el: Fix up docstring conventions.
 	Move vars to before their first use.
 	(rst-mode): Don't mess with font-lock-support-mode.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index bcf86a4b169..70704dc4d5e 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -552,7 +552,7 @@ property containing author and date information."
 Return nil if current line isn't annotated."
   (save-excursion
     (beginning-of-line)
-    (if (looking-at " *\\([0-9.]+\\) | ")
+    (if (looking-at " *\\([0-9.]+\\) *| ")
         (match-string-no-properties 1))))
 
 (defun vc-bzr-command-discarding-stderr (command &rest args)