# HG changeset patch # User Stefan Monnier # Date 1213985521 0 # Node ID d5ad6b6af42d746ad8db27143a9ece3149158c04 # Parent 8b630d07bb3f56b97eec4a726fb30ee24c446b8f (vc-bzr-annotate-extract-revision-at-line): Allow more than one space before the |. diff -r 8b630d07bb3f -r d5ad6b6af42d lisp/ChangeLog --- a/lisp/ChangeLog Fri Jun 20 17:57:55 2008 +0000 +++ b/lisp/ChangeLog Fri Jun 20 18:12:01 2008 +0000 @@ -1,5 +1,8 @@ 2008-06-20 Stefan Monnier + * 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 -r 8b630d07bb3f -r d5ad6b6af42d lisp/vc-bzr.el --- a/lisp/vc-bzr.el Fri Jun 20 17:57:55 2008 +0000 +++ b/lisp/vc-bzr.el Fri Jun 20 18:12:01 2008 +0000 @@ -552,7 +552,7 @@ 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)